Imported Upstream version 3.10.0upstream/3.10.0

129 files changed, 67006 insertions, 22271 deletions

diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index c2fc527..0000000
--- a/AUTHORS
+++ /dev/null
@@ -1 +0,0 @@
-Robert Ancell <robert.ancell@canonical.com>
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 3b9700e..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1 +0,0 @@
-See bzr+ssh://bazaar.launchpad.net/~robert-ancell/simple-scan/trunk/ for the revision history
\ No newline at end of file
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index 7d1c323..0000000
--- a/INSTALL
+++ /dev/null
@@ -1,365 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-
-   Copying and distribution of this file, with or without modification,
-are permitted in any medium without royalty provided the copyright
-notice and this notice are preserved.  This file is offered as-is,
-without warranty of any kind.
-
-Basic Installation
-==================
-
-   Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.  Some packages provide this
-`INSTALL' file but do not implement all of the features documented
-below.  The lack of an optional feature in a given package is not
-necessarily a bug.  More recommendations for GNU packages can be found
-in *note Makefile Conventions: (standards)Makefile Conventions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
-
-   The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.
-
-     Running `configure' might take a while.  While running, it prints
-     some messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package, generally using the just-built uninstalled binaries.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.  When installing into a prefix owned by root, it is
-     recommended that the package be configured and built as a regular
-     user, and only the `make install' phase executed with root
-     privileges.
-
-  5. Optionally, type `make installcheck' to repeat any self-tests, but
-     this time using the binaries in their final installed location.
-     This target does not install anything.  Running this target as a
-     regular user, particularly if the prior `make install' required
-     root privileges, verifies that the installation completed
-     correctly.
-
-  6. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-  7. Often, you can also type `make uninstall' to remove the installed
-     files again.  In practice, not all packages have tested that
-     uninstallation works correctly, even though it is required by the
-     GNU Coding Standards.
-
-  8. Some packages, particularly those that use Automake, provide `make
-     distcheck', which can by used by developers to test that all other
-     targets like `make install' and `make uninstall' work correctly.
-     This target is generally not run by end users.
-
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  Run `./configure --help'
-for details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-   You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you can use GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.  This
-is known as a "VPATH" build.
-
-   With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory.  After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
-
-   On MacOS X 10.5 and later systems, you can create libraries and
-executables that work on multiple system types--known as "fat" or
-"universal" binaries--by specifying multiple `-arch' options to the
-compiler but only a single `-arch' option to the preprocessor.  Like
-this:
-
-     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-                 CPP="gcc -E" CXXCPP="g++ -E"
-
-   This is not guaranteed to produce working output in all cases, you
-may have to build one architecture at a time and combine the results
-using the `lipo' tool if you have problems.
-
-Installation Names
-==================
-
-   By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX', where PREFIX must be an
-absolute file name.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.  In general, the
-default for these options is expressed in terms of `${prefix}', so that
-specifying just `--prefix' will affect all of the other directory
-specifications that were not explicitly provided.
-
-   The most portable way to affect installation locations is to pass the
-correct locations to `configure'; however, many packages provide one or
-both of the following shortcuts of passing variable assignments to the
-`make install' command line to change installation locations without
-having to reconfigure or recompile.
-
-   The first method involves providing an override variable for each
-affected directory.  For example, `make install
-prefix=/alternate/directory' will choose an alternate location for all
-directory configuration variables that were expressed in terms of
-`${prefix}'.  Any directories that were specified during `configure',
-but not in terms of `${prefix}', must each be overridden at install
-time for the entire installation to be relocated.  The approach of
-makefile variable overrides for each directory variable is required by
-the GNU Coding Standards, and ideally causes no recompilation.
-However, some platforms have known limitations with the semantics of
-shared libraries that end up requiring recompilation when using this
-method, particularly noticeable in packages that use GNU Libtool.
-
-   The second method involves providing the `DESTDIR' variable.  For
-example, `make install DESTDIR=/alternate/directory' will prepend
-`/alternate/directory' before all installation names.  The approach of
-`DESTDIR' overrides is not required by the GNU Coding Standards, and
-does not work on platforms that have drive letters.  On the other hand,
-it does better at avoiding recompilation issues, and works well even
-when some directory options were not specified in terms of `${prefix}'
-at `configure' time.
-
-Optional Features
-=================
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-   Some packages offer the ability to configure how verbose the
-execution of `make' will be.  For these packages, running `./configure
---enable-silent-rules' sets the default to minimal output, which can be
-overridden with `make V=1'; while running `./configure
---disable-silent-rules' sets the default to verbose, which can be
-overridden with `make V=0'.
-
-Particular systems
-==================
-
-   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
-CC is not installed, it is recommended to use the following options in
-order to use an ANSI C compiler:
-
-     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
-
-and if that doesn't work, install pre-built binaries of GCC for HP-UX.
-
-   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
-a workaround.  If GNU CC is not installed, it is therefore recommended
-to try
-
-     ./configure CC="cc"
-
-and if that doesn't work, try
-
-     ./configure CC="cc -nodtk"
-
-   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
-directory contains several dysfunctional programs; working variants of
-these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
-in your `PATH', put it _after_ `/usr/bin'.
-
-   On Haiku, software installed for all users goes in `/boot/common',
-not `/usr/local'.  It is recommended to use the following options:
-
-     ./configure --prefix=/boot/common
-
-Specifying the System Type
-==========================
-
-   There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on.  Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS
-     KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-   Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
-
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-`configure' Invocation
-======================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--help'
-`-h'
-     Print a summary of all of the options to `configure', and exit.
-
-`--help=short'
-`--help=recursive'
-     Print a summary of the options unique to this package's
-     `configure', and exit.  The `short' variant lists options used
-     only in the top level, while the `recursive' variant lists options
-     also present in any nested packages.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`--prefix=DIR'
-     Use DIR as the installation prefix.  *note Installation Names::
-     for more details, including other options available for fine-tuning
-     the installation locations.
-
-`--no-create'
-`-n'
-     Run the configure checks, but stop before creating any output
-     files.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
-
diff --git a/Makefile.am b/Makefile.am
index 0599e22..3bb2654 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,15 +1,16 @@
 SUBDIRS = src data help po
 
 EXTRA_DIST = \
+	README.md \
 	autogen.sh \
 	simple-scan.doap
 
 DISTCLEANFILES = \
 	Makefile.in \
 	aclocal.m4 \
+	compile \
 	configure \
 	depcomp \
-	gnome-doc-utils.make \
 	install-sh \
 	missing \
 	mkinstalldirs \
diff --git a/Makefile.in b/Makefile.in
index c7fed24..1144f29 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,23 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -49,9 +76,8 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/configure $(am__configure_deps) COPYING NEWS \
 	compile depcomp install-sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -60,24 +86,30 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -85,11 +117,32 @@ am__can_run_installinfo = \
   esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir dist dist-all distcheck
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	cscope distdir dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
@@ -100,6 +153,7 @@ am__remove_distdir = \
       && rm -rf "$(distdir)" \
       || { sleep 5 && rm -rf "$(distdir)"; }; \
   else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -125,8 +179,9 @@ am__relativize = \
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
+DIST_ARCHIVES = $(distdir).tar.xz
+DIST_TARGETS = dist-xz
 distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -157,6 +212,7 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
@@ -255,23 +311,23 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = src data help po
 EXTRA_DIST = \
+	README.md \
 	autogen.sh \
 	simple-scan.doap
 
 DISTCLEANFILES = \
 	Makefile.in \
 	aclocal.m4 \
+	compile \
 	configure \
 	depcomp \
-	gnome-doc-utils.make \
 	install-sh \
 	missing \
 	mkinstalldirs \
 	omf.make \
 	xmldocs.make
 
-all: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+all: all-recursive
 
 .SUFFIXES:
 am--refresh: Makefile
@@ -280,15 +336,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
-	      $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
 		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu Makefile
+	  $(AUTOMAKE) --foreign Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -309,38 +365,26 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 $(am__aclocal_m4_deps):
 
-config.h: stamp-h1
-	@if test ! -f $@; then rm -f stamp-h1; else :; fi
-	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-	@rm -f stamp-h1
-	cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
-	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
-	rm -f stamp-h1
-	touch $@
-
-distclean-hdr:
-	-rm -f config.h stamp-h1
-
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -355,57 +399,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -421,12 +420,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -438,15 +432,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -455,9 +445,31 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+	test ! -s cscope.files \
+	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+	-rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
@@ -525,40 +537,35 @@ distdir: $(DISTFILES)
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-bzip2: distdir
 	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-lzip: distdir
 	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
-	$(am__remove_distdir)
-
-dist-lzma: distdir
-	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-	$(am__remove_distdir)
-
+	$(am__post_remove_distdir)
 dist-xz: distdir
 	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-shar: distdir
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-zip: distdir
 	-rm -f $(distdir).zip
 	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
+dist dist-all:
+	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+	$(am__post_remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
@@ -569,8 +576,6 @@ distcheck: dist
 	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lzma*) \
-	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.lz*) \
 	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
 	*.tar.xz*) \
@@ -582,9 +587,9 @@ distcheck: dist
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir); chmod u+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
+	chmod -R a-w $(distdir)
+	chmod u+w $(distdir)
+	mkdir $(distdir)/_build $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
@@ -616,7 +621,7 @@ distcheck: dist
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
 	  && cd "$$am__cwd" \
 	  || exit 1
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
@@ -648,7 +653,7 @@ distcleancheck: distclean
 	       exit 1; } >&2
 check-am: all-am
 check: check-recursive
-all-am: Makefile config.h
+all-am: Makefile
 installdirs: installdirs-recursive
 installdirs-am:
 install: install-recursive
@@ -689,7 +694,7 @@ clean-am: clean-generic mostlyclean-am
 distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
 
@@ -751,24 +756,22 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
-	ctags-recursive install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am am--refresh check check-am clean clean-generic \
-	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-	dist-lzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
-	distcheck distclean distclean-generic distclean-hdr \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+	am--refresh check check-am clean clean-cscope clean-generic \
+	cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
+	dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
+	distcheck distclean distclean-generic distclean-tags \
+	distcleancheck distdir distuninstallcheck dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags tags-am uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/NEWS b/NEWS
index b1bea93..89da87f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,57 @@
-Overview of changes in simple-scan 3.6.1
+Overview of changes in simple-scan 3.10.0
 
+  * Fix --fix-pdf not working due to attempting to treat binary data as UTF-8
+
+Overview of changes in simple-scan 3.9.91
+
+  * Add appdata file
+
+Overview of changes in simple-scan 3.9.90
+
+  * Only autosave after a timeout
+
+Overview of changes in simple-scan 3.9.4.1
+
+  * Add missing gresource file to tarball
+
+Overview of changes in simple-scan 3.9.4
+
+  * Add support for Samsung devices that don't use the standard SANE
+    field names
+
+Overview of changes in simple-scan 3.9.3
+
+  * Update README to mention git mirror
+  * Hide C warnings
+  * Compile with Vala debugging information
+
+Overview of changes in simple-scan 3.9.2
+
+  * Force an extension when saving if one not provided
+  * Zero pad numbering when saving multiple files
+  * Add JPEG quality settings
+  * Set ICC profile and density units for JPEG files
+  * Use gdk-pixbuf instead of libjpeg when writing PDF files
+
+Overview of changes in simple-scan 3.9.1
+
+  * Add copy to clipboard function
+  * Compile UI files into binary
+  * Update build instructions
+
+Overview of changes in simple-scan 3.8.0
+
+  * Updated version
+
+Overview of changes in simple-scan 3.7.1
+
+  * Autosave document and restore on quit
+  * Add controls for brightness and contrast
   * Fix scan no longer working after an ADF scan completes
+  * Use GLib 2.32 threading API
   * Fix erroneous warning about failing to set ADF source
+  * Updated help
+  * Simplify build system
 
 Overview of changes in simple-scan 3.6.0
 
diff --git a/README b/README
deleted file mode 100644
index f97127b..0000000
--- a/README
+++ /dev/null
@@ -1 +0,0 @@
-https://launchpad.net/simple-scan
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..ac771d9
--- /dev/null
+++ b/README.md
@@ -0,0 +1,115 @@
+# SIMPLE SCAN
+
+This is the source code to "Simple Scan" a simple GNOME scanning application,
+using the sane scanning libraries.
+
+The Simple Scan homepage with further information is located at:
+https://launchpad.net/simple-scan
+
+
+
+## BUILDING
+
+Unfortunatly Simple Scan is a little bit picky about dependencies when building.
+The latest version of Simple Scan is primarily developed on
+
+* Ubuntu 12.04 LTS
+
+and know to successfully build using the following commands:
+
+```
+sudo apt-get install bzr
+bzr branch lp:simple-scan simple-scan && cd simple-scan
+sudo apt-get build-dep simple-scan
+sudo apt-get install libsqlite3-dev
+sudo apt-get install valac-0.16 vala-0.16
+sudo update-alternatives --config valac # select vala-0.16
+
+# one of the follwing
+./autogen.sh                           # system-wide installation
+./autogen.sh --prefix=`pwd`/install    # for development purposes
+
+make
+make install
+./install/bin/simple-scan
+```
+
+Due to popular demand we have an experimental git mirror at
+https://github.com/mnagel/simple-scan
+You can clone from there should you prefer git over bzr.
+Please keep in mind that the sync bzr->git is done manually.
+
+
+
+## DEBUGGING
+
+The following tips might be helpful when debugging.
+
+There is a --debug command line switch to enable more verbose logging:
+```
+./install/bin/simple-scan --debug
+```
+
+Log messages can also be found in the $HOME/.cache/simple-scan folder.
+
+Simple Scan config goes to $HOME/.gconf/apps/simple-scan/%gconf.xml
+and that file is best edited with the gconf-editor tool.
+
+If you don't have a scanner ready, you can use a virtual "test" scanner:
+```
+./install/bin/simple-scan --debug test
+```
+
+When debugging hardware issues always check xsane and especially scanimage.
+
+* http://xsane.org/
+* http://www.sane-project.org/man/scanimage.1.html
+
+
+
+## CONTRIBUTING
+
+The preferred way to contribute code to Simple Scan is
+to create a merge request on Launchpad.
+
+* Creating a merge request on Launchpad involves creating an account:
+https://login.launchpad.net/+new_account
+* You need set up a SSH key with Launchpad:
+https://launchpad.net/~/+editsshkeys
+* How to configure bazaar (whoami) and create commits: 
+http://doc.bazaar.canonical.com/latest/en/mini-tutorial/
+* Push the changes to a personal repository on Launchpad:
+bzr push lp:~$USER/simple-scan/$BRANCHNAME
+where $USER is your Launchpad Id and $COMMENT is a newly created branch name.
+* Propose merging your new branch to the master branch on:
+https://code.launchpad.net/~
+
+If everything is set up correctly the following should work:
+```
+FEATURE="foobar"
+LAUNCHPADID="name"
+bzr branch lp:simple-scan simple-scan-$FEATURE && cd simple-scan-$FEATURE
+bzr add .
+bzr commit -m "add $FEATURE"
+bzr push lp:~$LAUNCHPADID/simple-scan/$FEATURE
+xdg-open "https://code.launchpad.net/~"
+```
+
+If this does not work for you, feel free to contact us
+via one of the channels listed below.
+
+
+
+## CONTACT
+
+### Websites
+* https://launchpad.net/simple-scan
+* https://bugs.launchpad.net/simple-scan
+* https://answers.launchpad.net/simple-scan
+
+### Mailing Lists
+* https://launchpad.net/~simple-scan-users
+* https://launchpad.net/~simple-scan-team
+
+### IRC
+* Freenode (irc.ubuntu.com): #simple-scan
diff --git a/aclocal.m4 b/aclocal.m4
index eccc856..b075521 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,8 +1,7 @@
-# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.13.3 -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
-# Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -12,13 +11,14 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
 [m4_warning([this file was generated for autoconf 2.69.
 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'.])])
+To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
 # gnome-common.m4
 #
@@ -763,25 +763,22 @@ AC_SUBST([YELP_HELP_RULES])
 m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([YELP_HELP_RULES])])
 ])
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.11'
+[am__api_version='1.13'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.6], [],
+m4_if([$1], [1.13.3], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -797,24 +794,22 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.6])dnl
+[AM_AUTOMAKE_VERSION([1.13.3])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
 #
 # Of course, Automake must honor this variable whenever it calls a
 # tool from the auxiliary directory.  The problem is that $srcdir (and
@@ -833,7 +828,7 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 #
 # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
 # are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
+# harmless because $srcdir is '.', but things will broke when you
 # start a VPATH build or use an absolute $srcdir.
 #
 # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
@@ -859,22 +854,19 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 9
-
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
 # Define a conditional.
 AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+[AC_PREREQ([2.52])dnl
+ m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
 AC_SUBST([$1_TRUE])dnl
 AC_SUBST([$1_FALSE])dnl
 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
@@ -893,16 +885,14 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
-# 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 12
 
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
 # will think it sees a *use*, and therefore will trigger all it's
 # C support machinery.  Also note that it means that autoscan, seeing
@@ -912,7 +902,7 @@ fi])])
 # _AM_DEPENDENCIES(NAME)
 # ----------------------
 # See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
 # We try a few techniques and use that to set a single cache variable.
 #
 # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
@@ -925,12 +915,13 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
 AC_REQUIRE([AM_MAKE_INCLUDE])dnl
 AC_REQUIRE([AM_DEP_TRACK])dnl
 
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
+m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
+      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
+      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
+      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
+      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                    [depcc="$$1"   am_compiler_list=])
 
 AC_CACHE_CHECK([dependency style of $depcc],
                [am_cv_$1_dependencies_compiler_type],
@@ -938,8 +929,8 @@ AC_CACHE_CHECK([dependency style of $depcc],
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
   rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
@@ -979,16 +970,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -997,8 +988,8 @@ AC_CACHE_CHECK([dependency style of $depcc],
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
@@ -1006,7 +997,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
       fi
       ;;
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -1054,7 +1045,7 @@ AM_CONDITIONAL([am__fastdep$1], [
 # AM_SET_DEPDIR
 # -------------
 # Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
 AC_DEFUN([AM_SET_DEPDIR],
 [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
 AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
@@ -1064,9 +1055,13 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
 # AM_DEP_TRACK
 # ------------
 AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
+[AC_ARG_ENABLE([dependency-tracking], [dnl
+AS_HELP_STRING(
+  [--enable-dependency-tracking],
+  [do not reject slow dependency extractors])
+AS_HELP_STRING(
+  [--disable-dependency-tracking],
+  [speeds up one-time build])])
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
@@ -1081,20 +1076,18 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-#serial 5
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 [{
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
   case $CONFIG_FILES in
@@ -1107,7 +1100,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
     # Strip MF so we end up with the name of the file.
     mf=`echo "$mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
+    # We used to match only the files named 'Makefile.in', but
     # some people rename them; so instead we look at the file content.
     # Grep'ing the first line is not enough: some people post-process
     # each Makefile.in and add a new line on top of each file to say so.
@@ -1119,21 +1112,19 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
       continue
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
+    # from the Makefile without running 'make'.
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
+    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
     # simplest approach to changing $(DEPDIR) to its actual value in the
     # expansion.
     for file in `sed -n "
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue
       fdir=`AS_DIRNAME(["$file"])`
@@ -1151,7 +1142,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 # This macro should only be invoked once -- use via AC_REQUIRE.
 #
 # This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
+# is enabled.  FIXME.  This creates each '.P' file that we will
 # need in order to bootstrap the dependency handling code.
 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 [AC_CONFIG_COMMANDS([depfiles],
@@ -1159,29 +1150,14 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
      [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
 ])
 
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 16
-
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
 
@@ -1197,7 +1173,7 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.62])dnl
+[AC_PREREQ([2.65])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -1226,31 +1202,40 @@ AC_SUBST([CYGPATH_W])
 # Define the identity of the package.
 dnl Distinguish between old-style and new-style calls.
 m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+[AC_DIAGNOSE([obsolete],
+             [$0: two- and three-arguments forms are deprecated.])
+m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
  AC_SUBST([PACKAGE], [$1])dnl
  AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+m4_if(
+  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+  [ok:ok],,
   [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
 
 _AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
 
 # Some tools Automake needs.
 AC_REQUIRE([AM_SANITY_CHECK])dnl
 AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+AM_MISSING_PROG([AUTOCONF], [autoconf])
+AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+AM_MISSING_PROG([AUTOHEADER], [autoheader])
+AM_MISSING_PROG([MAKEINFO], [makeinfo])
 AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
 AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
@@ -1261,28 +1246,32 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
 			     [_AM_PROG_TAR([v7])])])
 _AM_IF_OPTION([no-dependencies],,
 [AC_PROVIDE_IFELSE([AC_PROG_CC],
-		  [_AM_DEPENDENCIES(CC)],
-		  [define([AC_PROG_CC],
-			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+		  [_AM_DEPENDENCIES([CC])],
+		  [m4_define([AC_PROG_CC],
+			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_CXX],
-		  [_AM_DEPENDENCIES(CXX)],
-		  [define([AC_PROG_CXX],
-			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+		  [_AM_DEPENDENCIES([CXX])],
+		  [m4_define([AC_PROG_CXX],
+			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-		  [_AM_DEPENDENCIES(OBJC)],
-		  [define([AC_PROG_OBJC],
-			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+		  [_AM_DEPENDENCIES([OBJC])],
+		  [m4_define([AC_PROG_OBJC],
+			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+		  [_AM_DEPENDENCIES([OBJCXX])],
+		  [m4_define([AC_PROG_OBJCXX],
+			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
 ])
-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_REQUIRE([AM_SILENT_RULES])dnl
+dnl The testsuite driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
 AC_CONFIG_COMMANDS_PRE(dnl
 [m4_provide_if([_AM_COMPILER_EXEEXT],
   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
 ])
 
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
 dnl mangled by Autoconf and run in a shell conditional statement.
 m4_define([_AC_COMPILER_EXEEXT],
@@ -1310,15 +1299,12 @@ for _am_header in $config_headers :; do
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # AM_PROG_INSTALL_SH
 # ------------------
 # Define $install_sh.
@@ -1332,16 +1318,14 @@ if test x"${install_sh}" != xset; then
     install_sh="\${SHELL} $am_aux_dir/install-sh"
   esac
 fi
-AC_SUBST(install_sh)])
+AC_SUBST([install_sh])])
 
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2003-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # Check whether the underlying file-system supports filenames
 # with a leading dot.  For instance MS-DOS doesn't.
 AC_DEFUN([AM_SET_LEADING_DOT],
@@ -1358,20 +1342,17 @@ AC_SUBST([am__leading_dot])])
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering
 
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
-# 2011 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 5
-
 # AM_MAINTAINER_MODE([DEFAULT-MODE])
 # ----------------------------------
 # Control maintainer-specific portions of Makefiles.
-# Default is to disable them, unless `enable' is passed literally.
-# For symmetry, `disable' may be passed as well.  Anyway, the user
+# Default is to disable them, unless 'enable' is passed literally.
+# For symmetry, 'disable' may be passed as well.  Anyway, the user
 # can override the default with the --enable/--disable switch.
 AC_DEFUN([AM_MAINTAINER_MODE],
 [m4_case(m4_default([$1], [disable]),
@@ -1382,10 +1363,11 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode's default is 'disable' unless 'enable' is passed
   AC_ARG_ENABLE([maintainer-mode],
-[  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful
-			  (and sometimes confusing) to the casual installer],
-      [USE_MAINTAINER_MODE=$enableval],
-      [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
+    [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
+      am_maintainer_other[ make rules and dependencies not useful
+      (and sometimes confusing) to the casual installer])],
+    [USE_MAINTAINER_MODE=$enableval],
+    [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
   AC_MSG_RESULT([$USE_MAINTAINER_MODE])
   AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
   MAINT=$MAINTAINER_MODE_TRUE
@@ -1393,18 +1375,14 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
 ]
 )
 
-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
-
 # AM_MAKE_INCLUDE()
 # -----------------
 # Check to see how make treats includes.
@@ -1422,7 +1400,7 @@ am__quote=
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
   am__include=include
@@ -1447,15 +1425,12 @@ AC_MSG_RESULT([$_am_result])
 rm -f confinc confmf
 ])
 
-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 6
-
 # AM_PROG_CC_C_O
 # --------------
 # Like AC_PROG_CC_C_O, but changed for automake.
@@ -1484,15 +1459,12 @@ m4_define([AC_PROG_CC],
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 6
-
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
 AC_DEFUN([AM_MISSING_PROG],
@@ -1500,11 +1472,10 @@ AC_DEFUN([AM_MISSING_PROG],
 $1=${$1-"${am_missing_run}$2"}
 AC_SUBST($1)])
 
-
 # AM_MISSING_HAS_RUN
 # ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
+# Define MISSING if not defined so far and test if it is modern enough.
+# If it is, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 AC_REQUIRE_AUX_FILE([missing])dnl
@@ -1517,54 +1488,22 @@ if test x"${MISSING+set}" != xset; then
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
 else
   am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
+  AC_MSG_WARN(['missing' script is too old or missing])
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
-# Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 1
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
-  [[\\/$]]* | ?:[[\\/]]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
-
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 5
-
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
 AC_DEFUN([_AM_MANGLE_OPTION],
@@ -1574,7 +1513,7 @@ AC_DEFUN([_AM_MANGLE_OPTION],
 # --------------------
 # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
 
 # _AM_SET_OPTIONS(OPTIONS)
 # ------------------------
@@ -1590,22 +1529,16 @@ AC_DEFUN([_AM_IF_OPTION],
 
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 5
-
 # AM_SANITY_CHECK
 # ---------------
 AC_DEFUN([AM_SANITY_CHECK],
 [AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
@@ -1616,32 +1549,40 @@ case `pwd` in
 esac
 case $srcdir in
   *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
-    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
 esac
 
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$[*]" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$[*]" != "X $srcdir/configure conftest.file" \
+	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+	# If neither matched, then we have a broken ls.  This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment.  This has actually
+	# happened.  Such a system could not be considered "sane".
+	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment])
+     fi
+     if test "$[2]" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
    test "$[2]" = conftest.file
    )
 then
@@ -1651,31 +1592,50 @@ else
    AC_MSG_ERROR([newly created file is older than distributed files!
 Check your system clock])
 fi
-AC_MSG_RESULT(yes)])
+AC_MSG_RESULT([yes])
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+AC_CONFIG_COMMANDS_PRE(
+  [AC_MSG_CHECKING([that generated files are newer than configure])
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   AC_MSG_RESULT([done])])
+rm -f conftest.file
+])
 
-# Copyright (C) 2009, 2011  Free Software Foundation, Inc.
+# Copyright (C) 2009-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # AM_SILENT_RULES([DEFAULT])
 # --------------------------
 # Enable less verbose build rules; with the default set to DEFAULT
-# (`yes' being less verbose, `no' or empty being verbose).
+# ("yes" being less verbose, "no" or empty being verbose).
 AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules],
-[  --enable-silent-rules          less verbose build output (undo: `make V=1')
-  --disable-silent-rules         verbose build output (undo: `make V=0')])
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no)  AM_DEFAULT_VERBOSITY=1;;
-*)   AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+[AC_ARG_ENABLE([silent-rules], [dnl
+AS_HELP_STRING(
+  [--enable-silent-rules],
+  [less verbose build output (undo: "make V=1")])
+AS_HELP_STRING(
+  [--disable-silent-rules],
+  [verbose build output (undo: "make V=0")])dnl
+])
+case $enable_silent_rules in @%:@ (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
 esac
 dnl
-dnl A few `make' implementations (e.g., NonStop OS and NextStep)
+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
 dnl do not support nested variable expansions.
 dnl See automake bug#9928 and bug#10237.
 am_make=${MAKE-make}
@@ -1693,7 +1653,7 @@ else
   am_cv_make_support_nested_variables=no
 fi])
 if test $am_cv_make_support_nested_variables = yes; then
-  dnl Using `$V' instead of `$(V)' breaks IRIX make.
+  dnl Using '$V' instead of '$(V)' breaks IRIX make.
   AM_V='$(V)'
   AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
 else
@@ -1710,44 +1670,40 @@ AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # AM_PROG_INSTALL_STRIP
 # ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
+# One issue with vendor 'install' (even GNU) is that you can't
 # specify the program used to strip binaries.  This is especially
 # annoying in cross-compiling environments, where the build's strip
 # is unlikely to handle the host's binaries.
 # Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
+# always use install-sh in "make install-strip", and initialize
 # STRIPPROG with the value of the STRIP variable (set by the user).
 AC_DEFUN([AM_PROG_INSTALL_STRIP],
 [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+# will honor the 'STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
 if test "$cross_compiling" != no; then
   AC_CHECK_TOOL([STRIP], [strip], :)
 fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2006-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 3
-
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
@@ -1761,18 +1717,16 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2004-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # _AM_PROG_TAR(FORMAT)
 # --------------------
 # Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
 #
 # Substitute a variable $(am__tar) that is a command
 # writing to stdout a FORMAT-tarball containing the directory
@@ -1782,107 +1736,153 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 # Substitute a variable $(am__untar) that extract such
 # a tarball read from stdin.
 #     $(am__untar) < result.tar
+#
 AC_DEFUN([_AM_PROG_TAR],
 [# Always define AMTAR for backward compatibility.  Yes, it's still used
 # in the wild :-(  We should find a proper way to deprecate it ...
 AC_SUBST([AMTAR], ['$${TAR-tar}'])
-m4_if([$1], [v7],
-     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
+
+# We'll loop over all known methods to create a tar archive until one works.
 _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
 
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
+m4_if([$1], [v7],
+  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+
+  [m4_case([$1],
+    [ustar],
+     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+      # There is notably a 21 bits limit for the UID and the GID.  In fact,
+      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+      # and bug#13588).
+      am_max_uid=2097151 # 2^21 - 1
+      am_max_gid=$am_max_uid
+      # The $UID and $GID variables are not portable, so we need to resort
+      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
+      # below are definitely unexpected, so allow the users to see them
+      # (that is, avoid stderr redirection).
+      am_uid=`id -u || echo unknown`
+      am_gid=`id -g || echo unknown`
+      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
+      if test $am_uid -le $am_max_uid; then
+         AC_MSG_RESULT([yes])
+      else
+         AC_MSG_RESULT([no])
+         _am_tools=none
+      fi
+      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
+      if test $am_gid -le $am_max_gid; then
+         AC_MSG_RESULT([yes])
+      else
+        AC_MSG_RESULT([no])
+        _am_tools=none
+      fi],
+
+  [pax],
+    [],
+
+  [m4_fatal([Unknown tar format])])
+
+  AC_MSG_CHECKING([how to create a $1 tar archive])
+
+  # Go ahead even if we have the value already cached.  We do so because we
+  # need to set the values for the 'am__tar' and 'am__untar' variables.
+  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+  for _am_tool in $_am_tools; do
+    case $_am_tool in
+    gnutar)
+      for _am_tar in tar gnutar gtar; do
+        AM_RUN_LOG([$_am_tar --version]) && break
+      done
+      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+      am__untar="$_am_tar -xf -"
+      ;;
+    plaintar)
+      # Must skip GNU tar: if it does not support --format= it doesn't create
+      # ustar tarball either.
+      (tar --version) >/dev/null 2>&1 && continue
+      am__tar='tar chf - "$$tardir"'
+      am__tar_='tar chf - "$tardir"'
+      am__untar='tar xf -'
+      ;;
+    pax)
+      am__tar='pax -L -x $1 -w "$$tardir"'
+      am__tar_='pax -L -x $1 -w "$tardir"'
+      am__untar='pax -r'
+      ;;
+    cpio)
+      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+      am__untar='cpio -i -H $1 -d'
+      ;;
+    none)
+      am__tar=false
+      am__tar_=false
+      am__untar=false
+      ;;
+    esac
 
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+    # If the value was cached, stop now.  We just wanted to have am__tar
+    # and am__untar set.
+    test -n "${am_cv_prog_tar_$1}" && break
+
+    # tar/untar a dummy directory, and stop if the command works.
+    rm -rf conftest.dir
+    mkdir conftest.dir
+    echo GrepMe > conftest.dir/file
+    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+    rm -rf conftest.dir
+    if test -s conftest.tar; then
+      AM_RUN_LOG([$am__untar <conftest.tar])
+      AM_RUN_LOG([cat conftest.dir/file])
+      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+    fi
+  done
   rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
 
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+
 AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
 # Autoconf support for the Vala compiler
 
-# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2008-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
-
-# Check whether the Vala compiler exists in `PATH'. If it is found, the
-# variable VALAC is set. Optionally a minimum release number of the
-# compiler can be requested.
+# Check whether the Vala compiler exists in $PATH.  If it is found, the
+# variable VALAC is set pointing to its absolute path.  Otherwise, it is
+# simply set to 'valac'.
+# Optionally a minimum release number of the compiler can be requested.
+# If the ACTION-IF-FOUND parameter is given, it will be run if a proper
+# Vala compiler is found.
+# Similarly, if the ACTION-IF-FOUND is given, it will be run if no proper
+# Vala compiler is found.  It defaults to simply print a warning about the
+# situation, but otherwise proceeding with the configuration.
 #
-# AM_PROG_VALAC([MINIMUM-VERSION])
-# --------------------------------
+# AM_PROG_VALAC([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# --------------------------------------------------------------------------
 AC_DEFUN([AM_PROG_VALAC],
-[AC_PATH_PROG([VALAC], [valac], [])
- AS_IF([test -z "$VALAC"],
-   [AC_MSG_WARN([No Vala compiler found.  You will not be able to compile .vala source files.])],
-   [AS_IF([test -n "$1"],
-      [AC_MSG_CHECKING([$VALAC is at least version $1])
+  [AC_PATH_PROG([VALAC], [valac], [valac])
+   AS_IF([test "$VALAC" != valac && test -n "$1"],
+      [AC_MSG_CHECKING([whether $VALAC is at least version $1])
        am__vala_version=`$VALAC --version | sed 's/Vala  *//'`
        AS_VERSION_COMPARE([$1], ["$am__vala_version"],
          [AC_MSG_RESULT([yes])],
          [AC_MSG_RESULT([yes])],
          [AC_MSG_RESULT([no])
-          AC_MSG_ERROR([Vala $1 not found.])])])])
-])
+          VALAC=valac])])
+    if test "$VALAC" = valac; then
+      m4_default([$3],
+        [AC_MSG_WARN([no proper vala compiler found])
+         AC_MSG_WARN([you will not be able to compile vala source files])])
+    else
+      m4_default([$2], [:])
+    fi])
 
diff --git a/compile b/compile
index 862a14e..531136b 100755
--- a/compile
+++ b/compile
@@ -1,10 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-03-05.13; # UTC
+scriptversion=2012-10-14.11; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -113,6 +112,11 @@ func_cl_dashl ()
       lib=$dir/$lib.lib
       break
     fi
+    if test -f "$dir/lib$lib.a"; then
+      found=yes
+      lib=$dir/lib$lib.a
+      break
+    fi
   done
   IFS=$save_IFS
 
diff --git a/config.h.in b/config.h.in
deleted file mode 100644
index 1f311ac..0000000
--- a/config.h.in
+++ /dev/null
@@ -1,67 +0,0 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the <jpeglib.h> header file. */
-#undef HAVE_JPEGLIB_H
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <sane/saneopts.h> header file. */
-#undef HAVE_SANE_SANEOPTS_H
-
-/* Define to 1 if you have the <sane/sane.h> header file. */
-#undef HAVE_SANE_SANE_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION
diff --git a/configure b/configure
index fc58c6f..69b3c43 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69.
+# Generated by GNU Autoconf 2.69 for simple-scan 3.10.0.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -635,14 +635,13 @@ MFLAGS=
 MAKEFLAGS=
 
 # Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-PACKAGE_URL=
-
-ac_unique_file="configure.ac"
+PACKAGE_NAME='simple-scan'
+PACKAGE_TARNAME='simple-scan'
+PACKAGE_VERSION='3.10.0'
+PACKAGE_STRING='simple-scan 3.10.0'
+PACKAGE_BUGREPORT=''
+PACKAGE_URL=''
+
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -725,12 +724,16 @@ XMLLINT
 ITSTOOL
 HELP_DIR
 LN_S
+EGREP
+GREP
+CPP
 HAVE_COLORD_FALSE
 HAVE_COLORD_TRUE
 COLORD_LIBS
 COLORD_CFLAGS
 SIMPLE_SCAN_LIBS
 SIMPLE_SCAN_CFLAGS
+GLIB_COMPILE_RESOURCES
 GSETTINGS_RULES
 GLIB_COMPILE_SCHEMAS
 gsettingsschemadir
@@ -738,10 +741,6 @@ PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 PKG_CONFIG
 GSETTINGS_DISABLE_SCHEMAS_COMPILE
-EGREP
-GREP
-CPP
-VALAC
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
@@ -759,14 +758,15 @@ CPPFLAGS
 LDFLAGS
 CFLAGS
 CC
-AM_BACKSLASH
-AM_DEFAULT_VERBOSITY
-AM_DEFAULT_V
-AM_V
+VALAC
 DISABLE_DEPRECATED
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
 am__untar
 am__tar
 AMTAR
@@ -831,8 +831,8 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
-enable_maintainer_mode
 enable_silent_rules
+enable_maintainer_mode
 enable_dependency_tracking
 enable_schemas_compile
 with_help_dir
@@ -846,7 +846,6 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
-CPP
 PKG_CONFIG
 PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
@@ -854,6 +853,7 @@ SIMPLE_SCAN_CFLAGS
 SIMPLE_SCAN_LIBS
 COLORD_CFLAGS
 COLORD_LIBS
+CPP
 ITSTOOL
 XMLLINT'
 
@@ -896,7 +896,7 @@ sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
 infodir='${datarootdir}/info'
 htmldir='${docdir}'
 dvidir='${docdir}'
@@ -1396,7 +1396,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
+\`configure' configures simple-scan 3.10.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1444,7 +1444,7 @@ Fine tuning of the installation directories:
   --infodir=DIR           info documentation [DATAROOTDIR/info]
   --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/simple-scan]
   --htmldir=DIR           html documentation [DOCDIR]
   --dvidir=DIR            dvi documentation [DOCDIR]
   --pdfdir=DIR            pdf documentation [DOCDIR]
@@ -1461,19 +1461,24 @@ _ACEOF
 fi
 
 if test -n "$ac_init_help"; then
-
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of simple-scan 3.10.0:";;
+   esac
   cat <<\_ACEOF
 
 Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-maintainer-mode  enable make rules and dependencies not useful
-			  (and sometimes confusing) to the casual installer
-  --enable-silent-rules          less verbose build output (undo: `make V=1')
-  --disable-silent-rules         verbose build output (undo: `make V=0')
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
+  --enable-silent-rules   less verbose build output (undo: "make V=1")
+  --disable-silent-rules  verbose build output (undo: "make V=0")
+  --enable-maintainer-mode
+                          enable make rules and dependencies not useful (and
+                          sometimes confusing) to the casual installer
+  --enable-dependency-tracking
+                          do not reject slow dependency extractors
+  --disable-dependency-tracking
+                          speeds up one-time build
   --disable-schemas-compile
                           Disable regeneration of gschemas.compiled on install
   --disable-nls           do not use Native Language Support
@@ -1491,7 +1496,6 @@ Some influential environment variables:
   LIBS        libraries to pass to the linker, e.g. -l<library>
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
-  CPP         C preprocessor
   PKG_CONFIG  path to pkg-config utility
   PKG_CONFIG_PATH
               directories to add to pkg-config's search path
@@ -1504,6 +1508,7 @@ Some influential environment variables:
   COLORD_CFLAGS
               C compiler flags for COLORD, overriding pkg-config
   COLORD_LIBS linker flags for COLORD, overriding pkg-config
+  CPP         C preprocessor
   ITSTOOL     Path to the `itstool` command
   XMLLINT     Path to the `xmllint` command
 
@@ -1573,7 +1578,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-configure
+simple-scan configure 3.10.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1625,52 +1630,6 @@ fi
 
 } # ac_fn_c_try_compile
 
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 test -x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_link
-
 # ac_fn_c_try_cpp LINENO
 # ----------------------
 # Try to preprocess conftest.$ac_ext, and return whether this succeeded.
@@ -1708,48 +1667,6 @@ fi
 
 } # ac_fn_c_try_cpp
 
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=$ac_status
-fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_run
-
 # ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
 # -------------------------------------------------------
 # Tests whether HEADER exists, giving a warning if it cannot be compiled using
@@ -1837,6 +1754,48 @@ fi
 
 } # ac_fn_c_check_header_mongrel
 
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
 # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
 # -------------------------------------------------------
 # Tests whether HEADER exists and can be compiled using the include files in
@@ -1868,6 +1827,52 @@ $as_echo "$ac_res" >&6; }
 
 } # ac_fn_c_check_header_compile
 
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 test -x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+
 # ac_fn_c_check_func LINENO FUNC VAR
 # ----------------------------------
 # Tests whether FUNC exists, setting the cache variable VAR accordingly
@@ -1938,7 +1943,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by $as_me, which was
+It was created by simple-scan $as_me 3.10.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2286,7 +2291,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-am__api_version='1.11'
+am__api_version='1.13'
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2412,9 +2417,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
 $as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
@@ -2425,32 +2427,40 @@ case `pwd` in
 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
+# Do 'set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" "$LINENO" 5
-   fi
-
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$*" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$*" != "X $srcdir/configure conftest.file" \
+	&& test "$*" != "X conftest.file $srcdir/configure"; then
+
+	# If neither matched, then we have a broken ls.  This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment.  This has actually
+	# happened.  Such a system could not be considered "sane".
+	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment" "$LINENO" 5
+     fi
+     if test "$2" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
    test "$2" = conftest.file
    )
 then
@@ -2462,6 +2472,16 @@ Check your system clock" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+
+rm -f conftest.file
+
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
@@ -2484,12 +2504,12 @@ if test x"${MISSING+set}" != xset; then
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
 else
   am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
 if test x"${install_sh}" != xset; then
@@ -2501,10 +2521,10 @@ if test x"${install_sh}" != xset; then
   esac
 fi
 
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
+# will honor the 'STRIP' environment variable to overrule this program.
 if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
@@ -2643,12 +2663,6 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
 $as_echo "$MKDIR_P" >&6; }
 
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
-  [\\/$]* | ?:[\\/]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
 for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -2731,6 +2745,45 @@ else
 fi
 rmdir .tst 2>/dev/null
 
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
   # is not polluted with repeated "-I."
@@ -2752,8 +2805,8 @@ fi
 
 
 # Define the identity of the package.
- PACKAGE=simple-scan
- VERSION=3.6.1
+ PACKAGE='simple-scan'
+ VERSION='3.10.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2781,19 +2834,67 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+mkdir_p='$(MKDIR_P)'
+
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 # Always define AMTAR for backward compatibility.  Yes, it's still used
 # in the wild :-(  We should find a proper way to deprecate it ...
 AMTAR='$${TAR-tar}'
 
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar  pax cpio none'
+
 am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
 
 
-ac_config_headers="$ac_config_headers config.h"
+
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=0;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
@@ -2831,46 +2932,78 @@ fi
 
 
 
-# Check whether --enable-silent-rules was given.
-if test "${enable_silent_rules+set}" = set; then :
-  enableval=$enable_silent_rules;
-fi
 
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no)  AM_DEFAULT_VERBOSITY=1;;
-*)   AM_DEFAULT_VERBOSITY=0;;
-esac
-am_make=${MAKE-make}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
-$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
-if ${am_cv_make_support_nested_variables+:} false; then :
+# Extract the first word of "valac", so it can be a program name with args.
+set dummy valac; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_VALAC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if $as_echo 'TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
-	@$(TRUE)
-.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
-  am_cv_make_support_nested_variables=yes
-else
-  am_cv_make_support_nested_variables=no
-fi
+  case $VALAC in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_VALAC="$VALAC" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_VALAC="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_VALAC" && ac_cv_path_VALAC="valac"
+  ;;
+esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
-$as_echo "$am_cv_make_support_nested_variables" >&6; }
-if test $am_cv_make_support_nested_variables = yes; then
-    AM_V='$(V)'
-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+VALAC=$ac_cv_path_VALAC
+if test -n "$VALAC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $VALAC" >&5
+$as_echo "$VALAC" >&6; }
 else
-  AM_V=$AM_DEFAULT_VERBOSITY
-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
-AM_BACKSLASH='\'
 
 
+   if test "$VALAC" != valac && test -n "0.16.0"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $VALAC is at least version 0.16.0" >&5
+$as_echo_n "checking whether $VALAC is at least version 0.16.0... " >&6; }
+       am__vala_version=`$VALAC --version | sed 's/Vala  *//'`
+       as_arg_v1=0.16.0
+as_arg_v2="$am__vala_version"
+awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null
+case $? in #(
+  1) :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; } ;; #(
+  0) :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; } ;; #(
+  2) :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+          VALAC=valac ;; #(
+  *) :
+     ;;
+esac
+fi
+    if test "$VALAC" = valac; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no proper vala compiler found" >&5
+$as_echo "$as_me: WARNING: no proper vala compiler found" >&2;}
+         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: you will not be able to compile vala source files" >&5
+$as_echo "$as_me: WARNING: you will not be able to compile vala source files" >&2;}
+    else
+      :
+    fi
 DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
@@ -2890,7 +3023,7 @@ am__quote=
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
   am__include=include
@@ -3734,8 +3867,8 @@ else
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
   rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
@@ -3770,16 +3903,16 @@ else
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -3788,8 +3921,8 @@ else
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
@@ -3797,7 +3930,7 @@ else
       fi
       ;;
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -3851,131 +3984,6 @@ else
 fi
 
 
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
-$as_echo_n "checking for library containing strerror... " >&6; }
-if ${ac_cv_search_strerror+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char strerror ();
-int
-main ()
-{
-return strerror ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' cposix; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_strerror=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_strerror+:} false; then :
-  break
-fi
-done
-if ${ac_cv_search_strerror+:} false; then :
-
-else
-  ac_cv_search_strerror=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5
-$as_echo "$ac_cv_search_strerror" >&6; }
-ac_res=$ac_cv_search_strerror
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
-# Extract the first word of "valac", so it can be a program name with args.
-set dummy valac; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_VALAC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $VALAC in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_VALAC="$VALAC" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_VALAC="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-VALAC=$ac_cv_path_VALAC
-if test -n "$VALAC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $VALAC" >&5
-$as_echo "$VALAC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- if test -z "$VALAC"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No Vala compiler found.  You will not be able to compile .vala source files." >&5
-$as_echo "$as_me: WARNING: No Vala compiler found.  You will not be able to compile .vala source files." >&2;}
-else
-  if test -n "0.16.0"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking $VALAC is at least version 0.16.0" >&5
-$as_echo_n "checking $VALAC is at least version 0.16.0... " >&6; }
-       am__vala_version=`$VALAC --version | sed 's/Vala  *//'`
-       as_arg_v1=0.16.0
-as_arg_v2="$am__vala_version"
-awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null
-case $? in #(
-  1) :
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; } ;; #(
-  0) :
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; } ;; #(
-  2) :
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-          as_fn_error $? "Vala 0.16.0 not found." "$LINENO" 5 ;; #(
-  *) :
-     ;;
-esac
-fi
-fi
-
 if test "x$CC" != xcc; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
 $as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
@@ -4102,386 +4110,6 @@ if test "$am_t" != yes; then
 fi
 
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if ${ac_cv_prog_CPP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
-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; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$GREP"; then
-  ac_path_GREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in grep ggrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_GREP" || continue
-# Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_GREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     if test -z "$EGREP"; then
-  ac_path_EGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in egrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_EGREP" || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_EGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_EGREP=$EGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
 
 
 
@@ -4715,6 +4343,46 @@ endif
 
 
 
+# Extract the first word of "glib-compile-resources", so it can be a program name with args.
+set dummy glib-compile-resources; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_GLIB_COMPILE_RESOURCES+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $GLIB_COMPILE_RESOURCES in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GLIB_COMPILE_RESOURCES="$GLIB_COMPILE_RESOURCES" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_GLIB_COMPILE_RESOURCES="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+GLIB_COMPILE_RESOURCES=$ac_cv_path_GLIB_COMPILE_RESOURCES
+if test -n "$GLIB_COMPILE_RESOURCES"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_COMPILE_RESOURCES" >&5
+$as_echo "$GLIB_COMPILE_RESOURCES" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
 
 
 
@@ -4728,6 +4396,7 @@ if test -n "$SIMPLE_SCAN_CFLAGS"; then
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
+    glib-2.0 >= 2.32
     gtk+-3.0
     gmodule-export-2.0
     gthread-2.0
@@ -4735,8 +4404,10 @@ if test -n "$SIMPLE_SCAN_CFLAGS"; then
     cairo
     gdk-pixbuf-2.0
     gudev-1.0
+    sqlite3
 \""; } >&5
   ($PKG_CONFIG --exists --print-errors "
+    glib-2.0 >= 2.32
     gtk+-3.0
     gmodule-export-2.0
     gthread-2.0
@@ -4744,11 +4415,13 @@ if test -n "$SIMPLE_SCAN_CFLAGS"; then
     cairo
     gdk-pixbuf-2.0
     gudev-1.0
+    sqlite3
 ") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SIMPLE_SCAN_CFLAGS=`$PKG_CONFIG --cflags "
+    glib-2.0 >= 2.32
     gtk+-3.0
     gmodule-export-2.0
     gthread-2.0
@@ -4756,6 +4429,7 @@ if test -n "$SIMPLE_SCAN_CFLAGS"; then
     cairo
     gdk-pixbuf-2.0
     gudev-1.0
+    sqlite3
 " 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
@@ -4769,6 +4443,7 @@ if test -n "$SIMPLE_SCAN_LIBS"; then
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
+    glib-2.0 >= 2.32
     gtk+-3.0
     gmodule-export-2.0
     gthread-2.0
@@ -4776,8 +4451,10 @@ if test -n "$SIMPLE_SCAN_LIBS"; then
     cairo
     gdk-pixbuf-2.0
     gudev-1.0
+    sqlite3
 \""; } >&5
   ($PKG_CONFIG --exists --print-errors "
+    glib-2.0 >= 2.32
     gtk+-3.0
     gmodule-export-2.0
     gthread-2.0
@@ -4785,11 +4462,13 @@ if test -n "$SIMPLE_SCAN_LIBS"; then
     cairo
     gdk-pixbuf-2.0
     gudev-1.0
+    sqlite3
 ") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SIMPLE_SCAN_LIBS=`$PKG_CONFIG --libs "
+    glib-2.0 >= 2.32
     gtk+-3.0
     gmodule-export-2.0
     gthread-2.0
@@ -4797,6 +4476,7 @@ if test -n "$SIMPLE_SCAN_LIBS"; then
     cairo
     gdk-pixbuf-2.0
     gudev-1.0
+    sqlite3
 " 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
@@ -4819,6 +4499,7 @@ else
 fi
         if test $_pkg_short_errors_supported = yes; then
 	        SIMPLE_SCAN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "
+    glib-2.0 >= 2.32
     gtk+-3.0
     gmodule-export-2.0
     gthread-2.0
@@ -4826,9 +4507,11 @@ fi
     cairo
     gdk-pixbuf-2.0
     gudev-1.0
+    sqlite3
 " 2>&1`
         else
 	        SIMPLE_SCAN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
+    glib-2.0 >= 2.32
     gtk+-3.0
     gmodule-export-2.0
     gthread-2.0
@@ -4836,12 +4519,14 @@ fi
     cairo
     gdk-pixbuf-2.0
     gudev-1.0
+    sqlite3
 " 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$SIMPLE_SCAN_PKG_ERRORS" >&5
 
 	as_fn_error $? "Package requirements (
+    glib-2.0 >= 2.32
     gtk+-3.0
     gmodule-export-2.0
     gthread-2.0
@@ -4849,6 +4534,7 @@ fi
     cairo
     gdk-pixbuf-2.0
     gudev-1.0
+    sqlite3
 ) were not met:
 
 $SIMPLE_SCAN_PKG_ERRORS
@@ -4978,6 +4664,387 @@ else
 fi
 
 
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if ${ac_cv_prog_CPP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+  break
+fi
+
+    done
+    ac_cv_prog_CPP=$CPP
+
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+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; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if ${ac_cv_path_GREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$GREP"; then
+  ac_path_GREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in grep ggrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_GREP" || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+  # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_GREP="$ac_path_GREP"
+      ac_path_GREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_GREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_GREP"; then
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_GREP=$GREP
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if ${ac_cv_path_EGREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in egrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_EGREP" || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_EGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_EGREP=$EGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if ${ac_cv_header_stdc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_stdc=yes
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+	|| toupper (i) != TOUPPER (i))
+      return 2;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
 # On IRIX 5.3, sys/types and inttypes.h are conflicting.
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
@@ -5023,20 +5090,6 @@ fi
 
 done
 
-for ac_header in jpeglib.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "jpeglib.h" "ac_cv_header_jpeglib_h" "$ac_includes_default"
-if test "x$ac_cv_header_jpeglib_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_JPEGLIB_H 1
-_ACEOF
-
-else
-  as_fn_error $? "libjpeg not found" "$LINENO" 5
-fi
-
-done
-
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
@@ -5996,7 +6049,43 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix
 # Let make expand exec_prefix.
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
-DEFS=-DHAVE_CONFIG_H
+# Transform confdefs.h into DEFS.
+# Protect against shell expansion while executing Makefile rules.
+# Protect against Makefile macro expansion.
+#
+# If the first sed substitution is executed (which looks for macros that
+# take arguments), then branch to the quote section.  Otherwise,
+# look for a macro that doesn't take arguments.
+ac_script='
+:mline
+/\\$/{
+ N
+ s,\\\n,,
+ b mline
+}
+t clear
+:clear
+s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\)/-D\1=\2/g
+t quote
+s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)/-D\1=\2/g
+t quote
+b any
+:quote
+s/[	 `~#$^&*(){}\\|;'\''"<>?]/\\&/g
+s/\[/\\&/g
+s/\]/\\&/g
+s/\$/$$/g
+H
+:any
+${
+	g
+	s/^\n//
+	s/\n/ /g
+	p
+}
+'
+DEFS=`sed -n "$ac_script" confdefs.h`
+
 
 ac_libobjs=
 ac_ltlibobjs=
@@ -6015,6 +6104,14 @@ LIBOBJS=$ac_libobjs
 LTLIBOBJS=$ac_ltlibobjs
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
  if test -n "$EXEEXT"; then
   am__EXEEXT_TRUE=
   am__EXEEXT_FALSE='#'
@@ -6440,7 +6537,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by $as_me, which was
+This file was extended by simple-scan $as_me 3.10.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6458,15 +6555,11 @@ case $ac_config_files in *"
 "*) set x $ac_config_files; shift; ac_config_files=$*;;
 esac
 
-case $ac_config_headers in *"
-"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
-esac
 
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
-config_headers="$ac_config_headers"
 config_commands="$ac_config_commands"
 
 _ACEOF
@@ -6488,15 +6581,10 @@ Usage: $0 [OPTION]... [TAG]...
       --recheck    update $as_me by reconfiguring in the same conditions
       --file=FILE[:TEMPLATE]
                    instantiate the configuration file FILE
-      --header=FILE[:TEMPLATE]
-                   instantiate the configuration header FILE
 
 Configuration files:
 $config_files
 
-Configuration headers:
-$config_headers
-
 Configuration commands:
 $config_commands
 
@@ -6506,7 +6594,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-config.status
+simple-scan config.status 3.10.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -6563,18 +6651,7 @@ do
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --he | --h)
-    # Conflict between --help and --header
-    as_fn_error $? "ambiguous option: \`$1'
-Try \`$0 --help' for more information.";;
-  --help | --hel | -h )
+  --he | --h |  --help | --hel | -h )
     $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
@@ -6635,7 +6712,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
-    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
@@ -6656,7 +6732,6 @@ done
 # bizarre bug on SunOS 4.1.3.
 if $ac_need_defaults; then
   test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
   test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
 fi
 
@@ -6845,116 +6920,8 @@ fi
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_FILES"
 
-# Set up the scripts for CONFIG_HEADERS section.
-# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
-if test -n "$CONFIG_HEADERS"; then
-cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
-BEGIN {
-_ACEOF
-
-# Transform confdefs.h into an awk script `defines.awk', embedded as
-# here-document in config.status, that substitutes the proper values into
-# config.h.in to produce config.h.
 
-# Create a delimiter string that does not exist in confdefs.h, to ease
-# handling of long lines.
-ac_delim='%!_!# '
-for ac_last_try in false false :; do
-  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_tt"; then
-    break
-  elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-# For the awk script, D is an array of macro values keyed by name,
-# likewise P contains macro parameters if any.  Preserve backslash
-# newline sequences.
-
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-sed -n '
-s/.\{148\}/&'"$ac_delim"'/g
-t rset
-:rset
-s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
-t def
-d
-:def
-s/\\$//
-t bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3"/p
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
-d
-:bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3\\\\\\n"\\/p
-t cont
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
-t cont
-d
-:cont
-n
-s/.\{148\}/&'"$ac_delim"'/g
-t clear
-:clear
-s/\\$//
-t bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/"/p
-d
-:bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
-b cont
-' <confdefs.h | sed '
-s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  for (key in D) D_is_set[key] = 1
-  FS = ""
-}
-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
-  line = \$ 0
-  split(line, arg, " ")
-  if (arg[1] == "#") {
-    defundef = arg[2]
-    mac1 = arg[3]
-  } else {
-    defundef = substr(arg[1], 2)
-    mac1 = arg[2]
-  }
-  split(mac1, mac2, "(") #)
-  macro = mac2[1]
-  prefix = substr(line, 1, index(line, defundef) - 1)
-  if (D_is_set[macro]) {
-    # Preserve the white space surrounding the "#".
-    print prefix "define", macro P[macro] D[macro]
-    next
-  } else {
-    # Replace #undef with comments.  This is necessary, for example,
-    # in the case of _POSIX_SOURCE, which is predefined and required
-    # on some systems where configure will not decide to define it.
-    if (defundef == "undef") {
-      print "/*", prefix defundef, macro, "*/"
-      next
-    }
-  }
-}
-{ print }
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
-fi # test -n "$CONFIG_HEADERS"
-
-
-eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+eval set X "  :F $CONFIG_FILES      :C $CONFIG_COMMANDS"
 shift
 for ac_tag
 do
@@ -7173,64 +7140,7 @@ which seems to be undefined.  Please make sure it is defined" >&2;}
   esac \
   || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
-  :H)
-  #
-  # CONFIG_HEADER
-  #
-  if test x"$ac_file" != x-; then
-    {
-      $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
-    } >"$ac_tmp/config.h" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      rm -f "$ac_file"
-      mv "$ac_tmp/config.h" "$ac_file" \
-	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    fi
-  else
-    $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error $? "could not create -" "$LINENO" 5
-  fi
-# Compute "$ac_file"'s index in $config_headers.
-_am_arg="$ac_file"
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $_am_arg | $_am_arg:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
-$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$_am_arg" : 'X\(//\)[^/]' \| \
-	 X"$_am_arg" : 'X\(//\)$' \| \
-	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$_am_arg" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`/stamp-h$_am_stamp_count
- ;;
+
 
   :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
 $as_echo "$as_me: executing $ac_file commands" >&6;}
@@ -7240,7 +7150,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
 
   case $ac_file$ac_mode in
     "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
   case $CONFIG_FILES in
@@ -7253,7 +7163,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
     # Strip MF so we end up with the name of the file.
     mf=`echo "$mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
+    # We used to match only the files named 'Makefile.in', but
     # some people rename them; so instead we look at the file content.
     # Grep'ing the first line is not enough: some people post-process
     # each Makefile.in and add a new line on top of each file to say so.
@@ -7287,21 +7197,19 @@ $as_echo X"$mf" |
       continue
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
+    # from the Makefile without running 'make'.
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
+    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
     # simplest approach to changing $(DEPDIR) to its actual value in the
     # expansion.
     for file in `sed -n "
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue
       fdir=`$as_dirname -- "$file" ||
diff --git a/configure.ac b/configure.ac
index 26a07d8..aa152be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,18 +1,16 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(configure.ac)
-AM_INIT_AUTOMAKE(simple-scan, 3.6.1)
-AM_CONFIG_HEADER(config.h)
+AC_INIT(simple-scan, 3.10.0)
+AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
+AM_SILENT_RULES([yes])
 AM_MAINTAINER_MODE
 GNOME_MAINTAINER_MODE_DEFINES
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
-AC_ISC_POSIX
 AM_PROG_VALAC([0.16.0])
 AM_PROG_CC_C_O
-AC_HEADER_STDC
 
 GLIB_GSETTINGS
+AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources)
 
 dnl ###########################################################################
 dnl Dependencies
@@ -23,6 +21,7 @@ dnl * gnome-icon-theme
 dnl * xdg-utils (for xdg-email)
 
 PKG_CHECK_MODULES(SIMPLE_SCAN, [
+    glib-2.0 >= 2.32
     gtk+-3.0
     gmodule-export-2.0
     gthread-2.0
@@ -30,6 +29,7 @@ PKG_CHECK_MODULES(SIMPLE_SCAN, [
     cairo
     gdk-pixbuf-2.0
     gudev-1.0
+    sqlite3
 ])
 
 PKG_CHECK_MODULES(COLORD, [
@@ -39,7 +39,6 @@ AM_CONDITIONAL(HAVE_COLORD, test $have_colord = yes)
 
 AC_CHECK_HEADERS([sane/sane.h],[],[AC_MSG_ERROR([SANE not found])])
 AC_CHECK_HEADERS([sane/saneopts.h],[],[AC_MSG_ERROR([SANE not found])])
-AC_CHECK_HEADERS([jpeglib.h],[],[AC_MSG_ERROR([libjpeg not found])])
 
 dnl ###########################################################################
 dnl Documentation
diff --git a/data/Makefile.am b/data/Makefile.am
index c99f807..b436f12 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,23 +1,25 @@
 SUBDIRS = icons
 
-uidir = $(datadir)/simple-scan
-ui_DATA = simple-scan.ui
-
-utilitiesdir = $(datadir)/applications
-utilities_in_files = simple-scan.desktop.in
-utilities_DATA = $(utilities_in_files:.desktop.in=.desktop)
+desktopdir = $(datadir)/applications
+desktop_DATA = simple-scan.desktop
 @INTLTOOL_DESKTOP_RULE@
 
+appdatadir = $(datadir)/appdata
+dist_appdata_DATA = simple-scan.appdata.xml
+
 gsettings_SCHEMAS = org.gnome.SimpleScan.gschema.xml
 @INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
-man1_MANS = simple-scan.1
+dist_man1_MANS = simple-scan.1
 
-EXTRA_DIST = $(ui_DATA) $(utilities_in_files) org.gnome.SimpleScan.gschema.xml.in $(man1_MANS)
+EXTRA_DIST = simple-scan.desktop.in \
+             org.gnome.SimpleScan.gschema.xml.in \
+             simple-scan.ui \
+             simple-scan.gresource.xml
 
 DISTCLEANFILES = \
 	Makefile.in \
 	$(schema_DATA) \
-	$(utilities_DATA) \
+	$(desktop_DATA) \
 	$(gsettings_SCHEMAS)
diff --git a/data/Makefile.in b/data/Makefile.in
index 76ca377..c0f39f2 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -50,30 +77,37 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 subdir = data
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(dist_man1_MANS) $(dist_appdata_DATA)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -107,16 +141,36 @@ am__uninstall_files_from_dir = { \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
 man1dir = $(mandir)/man1
-am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(uidir)" \
-	"$(DESTDIR)$(utilitiesdir)"
+am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(desktopdir)" \
+	"$(DESTDIR)$(appdatadir)"
 NROFF = nroff
-MANS = $(man1_MANS)
-DATA = $(ui_DATA) $(utilities_DATA)
+MANS = $(dist_man1_MANS)
+DATA = $(desktop_DATA) $(dist_appdata_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -172,6 +226,7 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
@@ -269,18 +324,21 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = icons
-uidir = $(datadir)/simple-scan
-ui_DATA = simple-scan.ui
-utilitiesdir = $(datadir)/applications
-utilities_in_files = simple-scan.desktop.in
-utilities_DATA = $(utilities_in_files:.desktop.in=.desktop)
+desktopdir = $(datadir)/applications
+desktop_DATA = simple-scan.desktop
+appdatadir = $(datadir)/appdata
+dist_appdata_DATA = simple-scan.appdata.xml
 gsettings_SCHEMAS = org.gnome.SimpleScan.gschema.xml
-man1_MANS = simple-scan.1
-EXTRA_DIST = $(ui_DATA) $(utilities_in_files) org.gnome.SimpleScan.gschema.xml.in $(man1_MANS)
+dist_man1_MANS = simple-scan.1
+EXTRA_DIST = simple-scan.desktop.in \
+             org.gnome.SimpleScan.gschema.xml.in \
+             simple-scan.ui \
+             simple-scan.gresource.xml
+
 DISTCLEANFILES = \
 	Makefile.in \
 	$(schema_DATA) \
-	$(utilities_DATA) \
+	$(desktop_DATA) \
 	$(gsettings_SCHEMAS)
 
 all: all-recursive
@@ -295,9 +353,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu data/Makefile
+	  $(AUTOMAKE) --foreign data/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -316,9 +374,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-install-man1: $(man1_MANS)
+install-man1: $(dist_man1_MANS)
 	@$(NORMAL_INSTALL)
-	@list1='$(man1_MANS)'; \
+	@list1='$(dist_man1_MANS)'; \
 	list2=''; \
 	test -n "$(man1dir)" \
 	  && test -n "`echo $$list1$$list2`" \
@@ -352,71 +410,74 @@ install-man1: $(man1_MANS)
 
 uninstall-man1:
 	@$(NORMAL_UNINSTALL)
-	@list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \
+	@list='$(dist_man1_MANS)'; test -n "$(man1dir)" || exit 0; \
 	files=`{ for i in $$list; do echo "$$i"; done; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
 	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
-install-uiDATA: $(ui_DATA)
+install-desktopDATA: $(desktop_DATA)
 	@$(NORMAL_INSTALL)
-	@list='$(ui_DATA)'; test -n "$(uidir)" || list=; \
+	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
 	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \
 	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(uidir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(uidir)" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(desktopdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopdir)" || exit $$?; \
 	done
 
-uninstall-uiDATA:
+uninstall-desktopDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(ui_DATA)'; test -n "$(uidir)" || list=; \
+	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir)
-install-utilitiesDATA: $(utilities_DATA)
+	dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir)
+install-dist_appdataDATA: $(dist_appdata_DATA)
 	@$(NORMAL_INSTALL)
-	@list='$(utilities_DATA)'; test -n "$(utilitiesdir)" || list=; \
+	@list='$(dist_appdata_DATA)'; test -n "$(appdatadir)" || list=; \
 	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(utilitiesdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(utilitiesdir)" || exit 1; \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(appdatadir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(appdatadir)" || exit 1; \
 	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(utilitiesdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(utilitiesdir)" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(appdatadir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(appdatadir)" || exit $$?; \
 	done
 
-uninstall-utilitiesDATA:
+uninstall-dist_appdataDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(utilities_DATA)'; test -n "$(utilitiesdir)" || list=; \
+	@list='$(dist_appdata_DATA)'; test -n "$(appdatadir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(utilitiesdir)'; $(am__uninstall_files_from_dir)
+	dir='$(DESTDIR)$(appdatadir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -431,57 +492,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -497,12 +513,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -514,15 +525,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -531,24 +538,26 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -608,7 +617,7 @@ check: check-recursive
 all-am: Makefile $(MANS) $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(uidir)" "$(DESTDIR)$(utilitiesdir)"; do \
+	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(appdatadir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
@@ -662,7 +671,8 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-man install-uiDATA install-utilitiesDATA
+install-data-am: install-desktopDATA install-dist_appdataDATA \
+	install-man
 
 install-dvi: install-dvi-recursive
 
@@ -706,27 +716,27 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-man uninstall-uiDATA uninstall-utilitiesDATA
+uninstall-am: uninstall-desktopDATA uninstall-dist_appdataDATA \
+	uninstall-man
 
 uninstall-man: uninstall-man1
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic ctags \
-	ctags-recursive distclean distclean-generic distclean-tags \
-	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-man1 install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip install-uiDATA \
-	install-utilitiesDATA installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
-	tags-recursive uninstall uninstall-am uninstall-man \
-	uninstall-man1 uninstall-uiDATA uninstall-utilitiesDATA
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic cscopelist-am ctags ctags-am \
+	distclean distclean-generic distclean-tags distdir dvi dvi-am \
+	html html-am info info-am install install-am install-data \
+	install-data-am install-desktopDATA install-dist_appdataDATA \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-man1 install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-desktopDATA uninstall-dist_appdataDATA uninstall-man \
+	uninstall-man1
 
 @INTLTOOL_DESKTOP_RULE@
 @INTLTOOL_XML_NOMERGE_RULE@
diff --git a/data/icons/Makefile.in b/data/icons/Makefile.in
index 902790b..3c5fe33 100644
--- a/data/icons/Makefile.in
+++ b/data/icons/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,23 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -49,21 +76,26 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 subdir = data/icons
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -71,6 +103,7 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -98,6 +131,7 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
@@ -215,9 +249,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/icons/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/icons/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu data/icons/Makefile
+	  $(AUTOMAKE) --foreign data/icons/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -236,11 +270,11 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -375,16 +409,16 @@ uninstall-am: uninstall-local
 
 .MAKE: install-am install-strip
 
-.PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am \
-	install-data-local install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+	ctags-am distclean distclean-generic distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-data-local install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-local
+	pdf-am ps ps-am tags-am uninstall uninstall-am uninstall-local
 
 
 install-data-local:
diff --git a/data/org.gnome.SimpleScan.gschema.xml.in b/data/org.gnome.SimpleScan.gschema.xml.in
index 2a6047f..da50c8a 100644
--- a/data/org.gnome.SimpleScan.gschema.xml.in
+++ b/data/org.gnome.SimpleScan.gschema.xml.in
@@ -63,6 +63,16 @@
       <_summary>Height of paper in tenths of a mm</_summary>
       <_description>The height of the paper in tenths of a mm (or 0 for automatic paper detection).</_description>
     </key>
+    <key name="brightness" type="i">
+      <default>0</default>
+      <_summary>Brightness of scan</_summary>
+      <_description>The brightness adjustment from -100 to 100 (0 being none).</_description>
+    </key>
+    <key name="contrast" type="i">
+        <default>0</default>
+        <_summary>Contrast of scan</_summary>
+        <_description>The contrast adjustment from -100 to 100 (0 being none).</_description>
+    </key>
     <key name="page-dpi" type="i">
       <default>72</default>
       <_summary>Resolution of last scanned image</_summary>
@@ -88,5 +98,11 @@
       <_summary>Directory to save files to</_summary>
       <_description>The directory to save files to.  Defaults to the documents directory if unset.</_description>
     </key>
+    <key name="jpeg-quality" type="i">
+      <range min="0" max="100"/>
+      <default>75</default>
+      <_summary>Quality value to use for JPEG compression</_summary>
+      <_description>Quality value to use for JPEG compression.</_description>
+    </key>
   </schema>
 </schemalist>
diff --git a/data/simple-scan.appdata.xml b/data/simple-scan.appdata.xml
new file mode 100644
index 0000000..dd57ff6
--- /dev/null
+++ b/data/simple-scan.appdata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application>
+  <id type="desktop">simple-scan.desktop</id>
+  <licence>CC0</licence>
+  <description>
+    <p>
+      A really easy way to scan both documents and photos.
+      You can crop out the bad parts of a photo and rotate it if it is the wrong way round.
+      You can print your scans, export them to pdf, or save them in a range of image formats.
+    </p>
+    <p>
+      Simple Scan uses the SANE framework to support most existing scanners.
+    </p>
+  </description>
+  <url type="homepage">https://launchpad.net/simple-scan</url>
+</application>
diff --git a/data/simple-scan.gresource.xml b/data/simple-scan.gresource.xml
new file mode 100644
index 0000000..b6fe6a6
--- /dev/null
+++ b/data/simple-scan.gresource.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/SimpleScan">
+    <file preprocess="xml-stripblanks">simple-scan.ui</file>
+  </gresource>
+</gresources>
diff --git a/data/simple-scan.ui b/data/simple-scan.ui
index 7a5d7c1..eb4ae02 100644
--- a/data/simple-scan.ui
+++ b/data/simple-scan.ui
@@ -325,6 +325,17 @@
                       </object>
                     </child>
                     <child>
+                      <object class="GtkImageMenuItem" id="copy_to_clipboard_menuitem">
+                        <property name="label">gtk-copy</property>
+                        <property name="visible">True</property>
+                        <property name="sensitive">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                        <accelerator key="c" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+                        <signal name="activate" handler="copy_to_clipboard_button_clicked_cb"/>
+                      </object>
+                    </child>                    
+                    <child>
                       <object class="GtkImageMenuItem" id="page_delete_menuitem">
                         <property name="label">gtk-delete</property>
                         <property name="visible">True</property>
@@ -676,7 +687,7 @@
           <object class="GtkTable" id="table3">
             <property name="visible">True</property>
             <property name="border_width">5</property>
-            <property name="n_rows">5</property>
+            <property name="n_rows">7</property>
             <property name="n_columns">2</property>
             <property name="column_spacing">6</property>
             <property name="row_spacing">6</property>
@@ -818,6 +829,96 @@
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkLabel" id="brightness_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes" comments="Label beside brightness scale">Brightness:</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">brightness_adjustment</property>
+              </object>
+              <packing>
+                <property name="top_attach">5</property>
+                <property name="bottom_attach">6</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkScale" id="brightness_scale">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="adjustment">brightness_adjustment</property>
+                <property name="draw_value">False</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">5</property>
+                <property name="bottom_attach">6</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="contrast_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes" comments="Label beside contrast scale">Contrast:</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">contrast_scale</property>
+              </object>
+              <packing>
+                <property name="top_attach">6</property>
+                <property name="bottom_attach">7</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkScale" id="contrast_scale">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="adjustment">contrast_adjustment</property>
+                <property name="draw_value">False</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">6</property>
+                <property name="bottom_attach">7</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="quality_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes" comments="Label beside quality scale">Quality:</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">quality_scale</property>
+              </object>
+              <packing>
+                <property name="top_attach">7</property>
+                <property name="bottom_attach">8</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkScale" id="quality_scale">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="adjustment">quality_adjustment</property>
+                <property name="draw_value">False</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">7</property>
+                <property name="bottom_attach">8</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="position">1</property>
@@ -954,4 +1055,22 @@
       <column type="gchararray"/>
     </columns>
   </object>
+  <object class="GtkAdjustment" id="brightness_adjustment">
+    <property name="lower">-100</property>
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="contrast_adjustment">
+    <property name="lower">-100</property>
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="quality_adjustment">
+    <property name="lower">0</property>
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
 </interface>
diff --git a/depcomp b/depcomp
index 25a39e6..4ebd5b3 100755
--- a/depcomp
+++ b/depcomp
@@ -1,10 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2012-03-27.16; # UTC
+scriptversion=2013-05-30.07; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
-# 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,9 +27,9 @@ scriptversion=2012-03-27.16; # UTC
 
 case $1 in
   '')
-     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
+    echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+    exit 1;
+    ;;
   -h | --h*)
     cat <<\EOF
 Usage: depcomp [--help] [--version] PROGRAM [ARGS]
@@ -57,11 +56,65 @@ EOF
     ;;
 esac
 
+# Get the directory component of the given path, and save it in the
+# global variables '$dir'.  Note that this directory component will
+# be either empty or ending with a '/' character.  This is deliberate.
+set_dir_from ()
+{
+  case $1 in
+    */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
+      *) dir=;;
+  esac
+}
+
+# Get the suffix-stripped basename of the given path, and save it the
+# global variable '$base'.
+set_base_from ()
+{
+  base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
+}
+
+# If no dependency file was actually created by the compiler invocation,
+# we still have to create a dummy depfile, to avoid errors with the
+# Makefile "include basename.Plo" scheme.
+make_dummy_depfile ()
+{
+  echo "#dummy" > "$depfile"
+}
+
+# Factor out some common post-processing of the generated depfile.
+# Requires the auxiliary global variable '$tmpdepfile' to be set.
+aix_post_process_depfile ()
+{
+  # If the compiler actually managed to produce a dependency file,
+  # post-process it.
+  if test -f "$tmpdepfile"; then
+    # Each line is of the form 'foo.o: dependency.h'.
+    # Do two passes, one to just change these to
+    #   $object: dependency.h
+    # and one to simply output
+    #   dependency.h:
+    # which is needed to avoid the deleted-header problem.
+    { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
+      sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
+    } > "$depfile"
+    rm -f "$tmpdepfile"
+  else
+    make_dummy_depfile
+  fi
+}
+
 # A tabulation character.
 tab='	'
 # A newline character.
 nl='
 '
+# Character ranges might be problematic outside the C locale.
+# These definitions help.
+upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
+lower=abcdefghijklmnopqrstuvwxyz
+digits=0123456789
+alpha=${upper}${lower}
 
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
   echo "depcomp: Variables source, object and depmode must be set" 1>&2
@@ -75,6 +128,9 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
 
 rm -f "$tmpdepfile"
 
+# Avoid interferences from the environment.
+gccflag= dashmflag=
+
 # Some modes work just like other modes, but use different flags.  We
 # parameterize here, but still list the modes in the big case below,
 # to make depend.m4 easier to write.  Note that we *cannot* use a case
@@ -86,32 +142,32 @@ if test "$depmode" = hp; then
 fi
 
 if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
+  # This is just like dashmstdout with a different argument.
+  dashmflag=-xM
+  depmode=dashmstdout
 fi
 
 cygpath_u="cygpath -u -f -"
 if test "$depmode" = msvcmsys; then
-   # This is just like msvisualcpp but w/o cygpath translation.
-   # Just convert the backslash-escaped backslashes to single forward
-   # slashes to satisfy depend.m4
-   cygpath_u='sed s,\\\\,/,g'
-   depmode=msvisualcpp
+  # This is just like msvisualcpp but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvisualcpp
 fi
 
 if test "$depmode" = msvc7msys; then
-   # This is just like msvc7 but w/o cygpath translation.
-   # Just convert the backslash-escaped backslashes to single forward
-   # slashes to satisfy depend.m4
-   cygpath_u='sed s,\\\\,/,g'
-   depmode=msvc7
+  # This is just like msvc7 but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvc7
 fi
 
 if test "$depmode" = xlc; then
-   # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
-   gccflag=-qmakedep=gcc,-MF
-   depmode=gcc
+  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
+  gccflag=-qmakedep=gcc,-MF
+  depmode=gcc
 fi
 
 case "$depmode" in
@@ -134,8 +190,7 @@ gcc3)
   done
   "$@"
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -143,13 +198,17 @@ gcc3)
   ;;
 
 gcc)
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## (see the conditional assignment to $gccflag above).
 ## There are various ways to get dependency output from gcc.  Here's
 ## why we pick this rather obscure method:
 ## - Don't want to use -MD because we'd like the dependencies to end
 ##   up in a subdir.  Having to rename by hand is ugly.
 ##   (We might end up doing this anyway to support other compilers.)
 ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
+##   -MM, not -M (despite what the docs say).  Also, it might not be
+##   supported by the other compilers which use the 'gcc' depmode.
 ## - Using -M directly means running the compiler twice (even worse
 ##   than renaming).
   if test -z "$gccflag"; then
@@ -157,15 +216,14 @@ gcc)
   fi
   "$@" -Wp,"$gccflag$tmpdepfile"
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
+  # The second -e expression handles DOS-style file names with drive
+  # letters.
   sed -e 's/^[^:]*: / /' \
       -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
 ## This next piece of magic avoids the "deleted header file" problem.
@@ -174,15 +232,15 @@ gcc)
 ## typically no way to rebuild the header).  We avoid this by adding
 ## dummy dependencies for each header file.  Too bad gcc doesn't do
 ## this for us directly.
-  tr ' ' "$nl" < "$tmpdepfile" |
 ## Some versions of gcc put a space before the ':'.  On the theory
 ## that the space means something, we add a space to the output as
 ## well.  hp depmode also adds that space, but also prefixes the VPATH
 ## to the object.  Take care to not repeat it in the output.
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
-      | sed -e 's/$/ :/' >> "$depfile"
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -200,8 +258,7 @@ sgi)
     "$@" -MDupdate "$tmpdepfile"
   fi
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -209,7 +266,6 @@ sgi)
 
   if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
     echo "$object : \\" > "$depfile"
-
     # Clip off the initial element (the dependent).  Don't try to be
     # clever and replace this with sed code, as IRIX sed won't handle
     # lines with more than a fixed number of characters (4096 in
@@ -217,19 +273,15 @@ sgi)
     # the IRIX cc adds comments like '#:fec' to the end of the
     # dependency line.
     tr ' ' "$nl" < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr "$nl" ' ' >> "$depfile"
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+      | tr "$nl" ' ' >> "$depfile"
     echo >> "$depfile"
-
     # The second pass generates a dummy entry for each header file.
     tr ' ' "$nl" < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> "$depfile"
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+      >> "$depfile"
   else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
+    make_dummy_depfile
   fi
   rm -f "$tmpdepfile"
   ;;
@@ -247,9 +299,8 @@ aix)
   # current directory.  Also, the AIX compiler puts '$object:' at the
   # start of each line; $object doesn't have directory information.
   # Version 6 uses the directory in both cases.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  set_dir_from "$object"
+  set_base_from "$object"
   if test "$libtool" = yes; then
     tmpdepfile1=$dir$base.u
     tmpdepfile2=$base.u
@@ -262,9 +313,7 @@ aix)
     "$@" -M
   fi
   stat=$?
-
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
     exit $stat
   fi
@@ -273,65 +322,113 @@ aix)
   do
     test -f "$tmpdepfile" && break
   done
-  if test -f "$tmpdepfile"; then
-    # Each line is of the form 'foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # '$object: dependent.h' and one to simply 'dependent.h:'.
-    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-    sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
+  aix_post_process_depfile
+  ;;
+
+tcc)
+  # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
+  # FIXME: That version still under development at the moment of writing.
+  #        Make that this statement remains true also for stable, released
+  #        versions.
+  # It will wrap lines (doesn't matter whether long or short) with a
+  # trailing '\', as in:
+  #
+  #   foo.o : \
+  #    foo.c \
+  #    foo.h \
+  #
+  # It will put a trailing '\' even on the last line, and will use leading
+  # spaces rather than leading tabs (at least since its commit 0394caf7
+  # "Emit spaces for -MD").
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
   fi
+  rm -f "$depfile"
+  # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
+  # We have to change lines of the first kind to '$object: \'.
+  sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
+  # And for each line of the second kind, we have to emit a 'dep.h:'
+  # dummy dependency, to avoid the deleted-header problem.
+  sed -n -e 's|^  *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
-icc)
-  # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
-  # However on
-  #    $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # ICC 7.0 will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-  # ICC 7.1 will output
+## The order of this option in the case statement is important, since the
+## shell code in configure will try each of these formats in the order
+## listed in this file.  A plain '-MD' option would be understood by many
+## compilers, so we must ensure this comes after the gcc and icc options.
+pgcc)
+  # Portland's C compiler understands '-MD'.
+  # Will always output deps to 'file.d' where file is the root name of the
+  # source file under compilation, even if file resides in a subdirectory.
+  # The object file name does not affect the name of the '.d' file.
+  # pgcc 10.2 will output
   #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using '\':
+  # and will wrap long lines using '\' :
   #    foo.o: sub/foo.c ... \
   #     sub/foo.h ... \
   #     ...
-  # tcc 0.9.26 (FIXME still under development at the moment of writing)
-  # will emit a similar output, but also prepend the continuation lines
-  # with horizontal tabulation characters.
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
+  set_dir_from "$object"
+  # Use the source, not the object, to determine the base name, since
+  # that's sadly what pgcc will do too.
+  set_base_from "$source"
+  tmpdepfile=$base.d
+
+  # For projects that build the same source file twice into different object
+  # files, the pgcc approach of using the *source* file root name can cause
+  # problems in parallel builds.  Use a locking strategy to avoid stomping on
+  # the same $tmpdepfile.
+  lockdir=$base.d-lock
+  trap "
+    echo '$0: caught signal, cleaning up...' >&2
+    rmdir '$lockdir'
+    exit 1
+  " 1 2 13 15
+  numtries=100
+  i=$numtries
+  while test $i -gt 0; do
+    # mkdir is a portable test-and-set.
+    if mkdir "$lockdir" 2>/dev/null; then
+      # This process acquired the lock.
+      "$@" -MD
+      stat=$?
+      # Release the lock.
+      rmdir "$lockdir"
+      break
+    else
+      # If the lock is being held by a different process, wait
+      # until the winning process is done or we timeout.
+      while test -d "$lockdir" && test $i -gt 0; do
+        sleep 1
+        i=`expr $i - 1`
+      done
+    fi
+    i=`expr $i - 1`
+  done
+  trap - 1 2 13 15
+  if test $i -le 0; then
+    echo "$0: failed to acquire lock after $numtries attempts" >&2
+    echo "$0: check lockdir '$lockdir'" >&2
+    exit 1
+  fi
+
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
   rm -f "$depfile"
-  # Each line is of the form 'foo.o: dependent.h',
-  # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'.
+  # Each line is of the form `foo.o: dependent.h',
+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
   # Do two passes, one to just change these to
-  # '$object: dependent.h' and one to simply 'dependent.h:'.
-  sed -e "s/^[ $tab][ $tab]*/  /" -e "s,^[^:]*:,$object :," \
-    < "$tmpdepfile" > "$depfile"
-  sed '
-    s/[ '"$tab"'][ '"$tab"']*/ /g
-    s/^ *//
-    s/ *\\*$//
-    s/^[^:]*: *//
-    /^$/d
-    /:$/d
-    s/$/ :/
-  ' < "$tmpdepfile" >> "$depfile"
+  # `$object: dependent.h' and one to simply `dependent.h:'.
+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -342,9 +439,8 @@ hp2)
   # 'foo.d', which lands next to the object file, wherever that
   # happens to be.
   # Much of this is similar to the tru64 case; see comments there.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  set_dir_from  "$object"
+  set_base_from "$object"
   if test "$libtool" = yes; then
     tmpdepfile1=$dir$base.d
     tmpdepfile2=$dir.libs/$base.d
@@ -355,8 +451,7 @@ hp2)
     "$@" +Maked
   fi
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
      rm -f "$tmpdepfile1" "$tmpdepfile2"
      exit $stat
   fi
@@ -366,76 +461,61 @@ hp2)
     test -f "$tmpdepfile" && break
   done
   if test -f "$tmpdepfile"; then
-    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+    sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
     # Add 'dependent.h:' lines.
     sed -ne '2,${
-	       s/^ *//
-	       s/ \\*$//
-	       s/$/:/
-	       p
-	     }' "$tmpdepfile" >> "$depfile"
+               s/^ *//
+               s/ \\*$//
+               s/$/:/
+               p
+             }' "$tmpdepfile" >> "$depfile"
   else
-    echo "#dummy" > "$depfile"
+    make_dummy_depfile
   fi
   rm -f "$tmpdepfile" "$tmpdepfile2"
   ;;
 
 tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in 'foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mechanism is used in libtool 1.4 series to
-      # handle both shared and static libraries in a single compilation.
-      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-      #
-      # With libtool 1.5 this exception was removed, and libtool now
-      # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in $dir.libs/$base.o.d and
-      # in $dir$base.o.d.  We have to check for both files, because
-      # one of the two compilations can be disabled.  We should prefer
-      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-      # automatically cleaned when .libs/ is deleted, while ignoring
-      # the former would cause a distcleancheck panic.
-      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1=$dir$base.o.d
-      tmpdepfile2=$dir$base.d
-      tmpdepfile3=$dir$base.d
-      tmpdepfile4=$dir$base.d
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-      exit $stat
-   fi
-
-   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-   do
-     test -f "$tmpdepfile" && break
-   done
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
+  # The Tru64 compiler uses -MD to generate dependencies as a side
+  # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+  # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+  # dependencies in 'foo.d' instead, so we check for that too.
+  # Subdirectories are respected.
+  set_dir_from  "$object"
+  set_base_from "$object"
+
+  if test "$libtool" = yes; then
+    # Libtool generates 2 separate objects for the 2 libraries.  These
+    # two compilations output dependencies in $dir.libs/$base.o.d and
+    # in $dir$base.o.d.  We have to check for both files, because
+    # one of the two compilations can be disabled.  We should prefer
+    # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+    # automatically cleaned when .libs/ is deleted, while ignoring
+    # the former would cause a distcleancheck panic.
+    tmpdepfile1=$dir$base.o.d          # libtool 1.5
+    tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
+    tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
+    "$@" -Wc,-MD
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    tmpdepfile3=$dir$base.d
+    "$@" -MD
+  fi
+
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  # Same post-processing that is required for AIX mode.
+  aix_post_process_depfile
+  ;;
 
 msvc7)
   if test "$libtool" = yes; then
@@ -446,8 +526,7 @@ msvc7)
   "$@" $showIncludes > "$tmpdepfile"
   stat=$?
   grep -v '^Note: including file: ' "$tmpdepfile"
-  if test "$stat" = 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -473,6 +552,7 @@ $ {
   G
   p
 }' >> "$depfile"
+  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
   rm -f "$tmpdepfile"
   ;;
 
@@ -524,13 +604,14 @@ dashmstdout)
   # in the target name.  This is to cope with DOS-style filenames:
   # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
   "$@" $dashmflag |
-    sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile"
+    sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
   rm -f "$depfile"
   cat < "$tmpdepfile" > "$depfile"
-  tr ' ' "$nl" < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this sed invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -583,10 +664,12 @@ makedepend)
   # makedepend may prepend the VPATH from the source file name to the object.
   # No need to regex-escape $object, excess matching of '.' is harmless.
   sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process the last invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed '1,2d' "$tmpdepfile" \
+    | tr ' ' "$nl" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile" "$tmpdepfile".bak
   ;;
 
@@ -622,10 +705,10 @@ cpp)
     esac
   done
 
-  "$@" -E |
-    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
+  "$@" -E \
+    | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+             -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+    | sed '$ s: \\$::' > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
   cat < "$tmpdepfile" >> "$depfile"
@@ -657,15 +740,15 @@ msvisualcpp)
       shift
       ;;
     "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
+        set fnord "$@"
+        shift
+        shift
+        ;;
     *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
+        set fnord "$@" "$arg"
+        shift
+        shift
+        ;;
     esac
   done
   "$@" -E 2>/dev/null |
diff --git a/help/C/adf.page b/help/C/adf.page
index 8d8a3dc..91886ce 100644
--- a/help/C/adf.page
+++ b/help/C/adf.page
@@ -9,10 +9,44 @@
 	<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.
+    If your scanner features an Automatic Document Feeder (ADF) 
+    you can scan all the pages from the feeder via one of following methods:
     </p>
+      <steps>
+	<title></title>
+	<title>Use a Keyboard Shortcut</title>
+	<item>
+	  <p>Press <keyseq><key>Ctrl</key><key>F</key></keyseq></p>
+	</item>      
+      </steps>
+      
+      <steps>
+	<title>Use a Menu</title>
+	<item>
+	  <p>Navigate to <guiseq><gui>Document</gui>
+	  <gui>Scan</gui><gui>All Pages From Feeder</gui></guiseq>.
+	  </p>
+	</item>
+      </steps>
+      
+      <steps>
+	<title>Use the Toolbar Buttons</title>
+	<item>
+	  <p>Click on the arrow to the right of the "Scan" button.</p>
+	</item>
+	<item>
+	  <p>Choose "All Pages From Feeder".</p>
+	  <media type="image" src="figures/scan_toolbar.png"/>
+	</item>
+      </steps>
+    
+    
+    <note style="tip">
     <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.
+    By default, both sides of a sheet will scan if your scanner has this capability.
+    You can choose single side scanning from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
     </p>
+    <media type="image" src="figures/preferences.png"/>
+    </note>
+    
 </page>
diff --git a/help/C/crop.page b/help/C/crop.page
index 4102c9d..b65893e 100644
--- a/help/C/crop.page
+++ b/help/C/crop.page
@@ -9,16 +9,37 @@
 	<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.
+    The cropping feature in <app>Simple Scan</app> allows you to use only a part of a scanned image. You can
+    enable crop either before or after scanning a page, and you can always change the dimensions of the crop
+    frame. When crop is enabled, a mask will apper over the current page with the area not being used shown
+    in gray. You can enable crop and choose the desired dimensions via one of the following methods:
     </p>
+    
+    <steps>
+      <title>Use a Right Click</title>
+      <item><p>Right click anywhere on the image area and select "Crop".</p></item>
+      <item><p>Choose one of the fixed crop frames, or select "Custom" to manually
+	set the crop frame's dimensions by dragging its borders.</p></item>
+      <item><p>Click and hold the frame, then move it to the desired position.</p></item>
+    </steps>
+    
+    <steps>
+      <title>Use a Menu</title>
+      <item><p>Navigate to the <guiseq><gui>Page</gui><gui>Crop</gui></guiseq> menu.</p></item>
+      <item><p>Choose one of the fixed crop frames, or select "Custom" to manually adjust the frame's dimensions by dragging its borders.</p></item>
+      <item><p>Click and hold the frame, then move it to the desired position.</p></item>
+    </steps>
+    
+    <steps>
+      <title>Use the Toolbar</title>
+      <item><p>Click the "<gui>Crop</gui>" button in the toolbar.</p>
+	    <note style="tip"><p>This is the same as choosing "Custom" in step 2 of the
+	      aforementioned methods.</p></note></item>      
+      <item><p>Drag the borders of the frame to set the desired dimensions and position.</p></item>
+
+    </steps>
+    
+    <note><p>
+    Each new scanned page will use the previous crop.
+    </p></note>
 </page>
diff --git a/help/C/dpi.page b/help/C/dpi.page
index a274bca..ea8deeb 100644
--- a/help/C/dpi.page
+++ b/help/C/dpi.page
@@ -9,7 +9,49 @@
 	<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.
+    The default resolution for document type <gui><em>Text</em></gui> is 150 dpi (dots per inch)
+    and for document type <gui><em>Photo</em></gui> is 300 dpi. You can change these settings
+    from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
     </p>
+    <media type="image" src="figures/preferences.png"/>
+    
+    <p>The available scanning resolutions for both document types (Text and Photo) are the same
+    and are listed in the following table:</p>
+    
+    <table frame="bottom left right" rules="rows cols" shade="rows">
+	<tr>
+		<td><p><em>Text Resolution</em></p></td>
+		<td><p><em>Photo Resolution</em></p></td>
+	</tr>
+	<tr>
+		<td><p>75 dpi (draft)</p></td>
+		<td><p>75 dpi (draft)</p></td>
+	</tr>
+	<tr>
+		<td><p>150 dpi (default)</p></td>
+		<td><p>150 dpi</p></td>
+	</tr>
+	<tr>
+		<td><p>300 dpi</p></td>
+		<td><p>300 dpi (default)</p></td>
+	</tr>
+	<tr>
+		<td><p>600 dpi</p></td>
+		<td><p>600 dpi</p></td>
+	</tr>
+	<tr>
+		<td><p>1200 dpi (high resolution)</p></td>
+		<td><p>1200 dpi (high resolution)</p></td>
+	</tr>
+	<tr>
+		<td><p>2400 dpi</p></td>
+		<td><p>2400 dpi</p></td>
+	</tr>
+    </table>
+    
+    <note style="important"><p><gui><em>Text</em></gui> documents are always scanned in black
+      and white, while <gui><em>Photo</em></gui> documents are always scanned in color, at any
+      resolution!</p>
+    </note>
+
 </page>
diff --git a/help/C/email.page b/help/C/email.page
index 42540c2..e918e84 100644
--- a/help/C/email.page
+++ b/help/C/email.page
@@ -9,11 +9,14 @@
 	<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.
+    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.    
+    If the document type was set to "Text" the email will have a PDF attachment for each page. 
+    Conversely, if the document type was set to "Photo", the email will have a JPEG
+    attachment for each page.    
     </p>
     <p>
     See <link xref="save"/> for more information about file formats.
diff --git a/help/C/index.page b/help/C/index.page
index 6f5bff1..c9d8425 100644
--- a/help/C/index.page
+++ b/help/C/index.page
@@ -7,10 +7,14 @@
 			<name>Robert Ancell</name>
 			<email>robert.ancell@gmail.com</email>
 		</credit>
+		<credit type="author">
+			<name>Ali Shtarbanov</name>
+			<email>ametedinov@gmail.com</email>
+		</credit>
 		<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
 	</info>
 
-	<title>Simple Scan Help</title>
+	<title><media type="image" src="figures/icon.png"/> Simple Scan Manual</title>
     
     <section id="acquire" style="2column">
         <title>Scanning Pages</title>
@@ -23,4 +27,8 @@
     <section id="use" style="2column">
         <title>Using the Document</title>
     </section>
+
+    <section id="shortcuts" style="2column">
+	<title>Simple Scan Shortcuts</title>
+    </section>
 </page>
diff --git a/help/C/print.page b/help/C/print.page
index 8f182ca..5c7794a 100644
--- a/help/C/print.page
+++ b/help/C/print.page
@@ -9,6 +9,22 @@
 	<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>).
+    <app>Simple Scan</app> allows you print a scanned document directly from the its
+    interface, without having to save the document first. This feature makes <app>Simple
+    Scan</app> a very convenient tool for making copies of documents or photos. 
     </p>
+    <steps>
+      <title>To Print a Document</title>
+      <item>
+	<p>Go to the <guiseq><gui>Document</gui><gui>Print</gui>
+	</guiseq> menu or use the keyboard shortcut <keyseq><key>Ctrl</key><key>P</key></keyseq>.
+	This will open the "Print" dialog box.
+	</p>
+      </item>
+      <item>
+	<p>From the "Print" dialog box choose your desired printing settings and/or Print Preview
+	the document, then press the "Print" button.
+	</p>
+      </item>
+     </steps>
 </page>
diff --git a/help/C/reorder.page b/help/C/reorder.page
index 0892e4c..f816acb 100644
--- a/help/C/reorder.page
+++ b/help/C/reorder.page
@@ -9,9 +9,13 @@
 	<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>
+    To move a page, right click on it and choose <gui><em>Move Left</em></gui> or 
+    <gui><em>Move Right</em></gui>.
+    </p> 
+    
     <p>
-    To remove the selected page use the <key>Delete</key> key.
-    </p>
+    Alternatively, you can move a page by first selecting it and then choosing 
+    <gui><em>Move Left</em></gui> or <gui><em>Move Right</em></gui> from the "Page" menu.
+    </p> 
+
 </page>
diff --git a/help/C/rotate.page b/help/C/rotate.page
index caa8532..b64c69f 100644
--- a/help/C/rotate.page
+++ b/help/C/rotate.page
@@ -6,10 +6,52 @@
         <link type="guide" xref="index#modify"/>
     </info>
   
-	<title>Rotating Pages</title>
+	<title>Rotating a Page</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.
+    In <app>Simple Scan</app>, you can change the rotation of a page either before or after scanning the page.
+    Currently, there are four ways to rotate a page: 
     </p>
+    
+    <steps>
+      <title>Use Toolbar Buttons</title>
+      <item><p>Select the page you want to rotate by clicking on it once.</p></item>
+      <item><p>Press one of the arrows on the toolbar to rotate the page in the desired direction.</p></item>
+    </steps>
+    <steps>
+      <title>Use Right Click</title>
+      <item><p>Right click on the page you want to rotate.</p></item>
+      <item><p>From the context menu choose "Rotate Left" or "Rotate Right".</p></item>
+    </steps>
+    
+    <steps>
+      <title>Use a Menu</title>
+      <item><p>Select the page you want to rotate by clicking on it once.</p></item>
+      <item><p>Click the "Page" menu and select "Rotate Left" or "Rotate Right".</p></item>
+    </steps>
+    
+    <steps>
+      <title>Use Shortcuts</title>
+      <item><p>Select the page you want to rotate by clicking on it once.</p></item>
+      <item><p>Press one of the following shortcut keys:</p>
+	<table frame="bottom left right" rules="rows cols" shade="rows">
+	<tr>
+		<td><p><em>Command</em></p></td>
+		<td><p><em>Shortcut Key</em></p></td>
+	</tr>
+	<tr>
+		<td><p>Rotate Left</p></td>
+		<td><p><key>[</key> (left bracket)</p></td>
+	</tr>
+	<tr>
+		<td><p>Rotate Right</p></td>
+		<td><p><key>]</key> (right bracket)</p></td>
+	</tr>
+	</table>
+      </item>
+    </steps>
+    
+    <note><p>
+    Each new scanned page will use the previous rotation.
+    </p></note>
 </page>
diff --git a/help/C/save.page b/help/C/save.page
index 8c1a7b1..575c36a 100644
--- a/help/C/save.page
+++ b/help/C/save.page
@@ -8,25 +8,61 @@
   
 	<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>
+    <steps>
       <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>
+	<p>Navigate to the <guiseq><gui>Document</gui><gui>Save As</gui></guiseq> menu 
+	(or press <keyseq><key>Shift</key><key>Ctrl</key><key>S</key></keyseq>).
+	</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>
+	<p>From the "Save As" dialog box, choose one of the supported file
+	types, or simply change the extension in the "Name" field. 
+	</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>
+	<p>Press the "Save" button.</p>
       </item>
-    </terms>
+    </steps>
+    
+    
+<table frame="bottom left right top" rules="rows cols" shade="rows">
+	<title>Supported File Types</title>
+	<tr>
+		<td><p><em>Type</em></p></td>
+		<td><p><em>Brief Description</em></p></td>
+	</tr>
+	<tr>
+		<td><p>PDF</p></td>
+		<td><p>A PDF can contain multiple pages, like a book, and is easy to distribute. Only a small number
+		of linux programs can modify PDF documents, so this format is recommended primarily for archiving.
+		See the <link href="http://en.wikipedia.org/wiki/pdf">PDF Wiki page</link> for more information.
+		    </p></td>
+	</tr>
+	<tr>
+		<td><p>JPEG</p></td>
+		<td><p>JPEG is the file format used by digital cameras to save pictures. A JPEG file is relatively
+		small, very easy to distribute, and suitable for uploading to social networking sites. Most operating
+		systems come with a JPEG editor by default. If you have scanned multiple pages, a JPEG file will be
+		created for each page. Use this file type if you want to modify or upload the scanned images.
+		See the <link href="http://en.wikipedia.org/wiki/jpeg">JPEG Wiki page</link> for more information.
+		    </p></td>
+	</tr>
+	<tr>
+		<td><p>PNG</p></td>
+		<td><p>PNG files contain the raw data from the scanner. This makes them very large and not suitable
+		for distributing. If you have scanned multiple pages, a PNG file will be created for each page.
+		See the <link href="http://en.wikipedia.org/wiki/Portable_Network_Graphics">PNG Wiki page</link>
+		for more information.
+		    </p></td>
+	</tr>
+	<tr>
+		<td><p>TIFF</p></td>
+		<td><p>TIFF files contain the raw data from the scanner. This makes them very large and not suitable
+		for distributing. If you have scanned multipe pages, a TIFF file will be created for each page.
+		See the <link href="http://en.wikipedia.org/wiki/Tagged_Image_File_Format">TIFF Wiki page</link>
+		for more information.
+		    </p></td>
+	</tr>
+
+</table>    
 </page>
diff --git a/help/C/scanner.page b/help/C/scanner.page
index d7decd2..3762cc1 100644
--- a/help/C/scanner.page
+++ b/help/C/scanner.page
@@ -9,11 +9,12 @@
 	<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.
+    If you have multiple scanning devices you can change the selected device from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
     </p>
-
+    <media type="image" src="figures/preferences.png"/>
     <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.
+    Your local scanners are automatically detected each time you start <app>Simple Scan</app>
+    and each time you plug in a USB scanner. If you connect a network scanner while <app>Simple Scan</app>
+    is running, you will need to restart <app>Simple Scan</app> for the scanner to be detected.
     </p>
 </page>
diff --git a/help/C/scanning.page b/help/C/scanning.page
index 5d0b470..c48a99d 100644
--- a/help/C/scanning.page
+++ b/help/C/scanning.page
@@ -13,38 +13,23 @@
     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>
+      <item><p>Connect the scanner to your computer and power it on.</p></item>
+      <item><p>Open <app>Simple Scan</app>.</p></item>
+      <item><p>Click the arrow to the right of the "Scan" button and choose the type
+	     of document you are scanning: <em>Photo</em> or <em>Text</em>.</p>
+	     <media type="image" src="figures/scan_toolbar.png"/></item>
+      <item><p>Click the "Scan" button on the toolbar (or press <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>
+    <note><p>
+    The page will be shown as it is scanned. To stop the scan at any time press the <key>Esc</key>
+    key on the keyboard. Each page you scan is placed at the end of the document.
+    </p></note>
 
     <p>
-    To stop the scan at any time press <key>Escape</key>.
+      The document type can be also be changed from the <guiseq><gui>Document</gui>
+      <gui>Scan</gui></guiseq> menu. Choose <gui><em>Text</em></gui> if you want the document
+      to be quickly scanned in black and white; choose <gui><em>Photo</em></gui> for a high 
+      resolution color scan. See <link xref="dpi"/> for more details and more options.
     </p>
 </page>
diff --git a/help/Makefile.in b/help/Makefile.in
index 73e6c26..f82d73f 100644
--- a/help/Makefile.in
+++ b/help/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,23 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -49,21 +76,26 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 subdir = help
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -71,6 +103,7 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -98,6 +131,7 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
@@ -225,9 +259,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu help/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign help/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu help/Makefile
+	  $(AUTOMAKE) --foreign help/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -246,11 +280,11 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -386,15 +420,16 @@ uninstall-am:
 
 .MAKE: install-am install-strip
 
-.PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+	ctags-am distclean distclean-generic distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags-am uninstall uninstall-am
 
 @YELP_HELP_RULES@
 
diff --git a/help/de/adf.page b/help/de/adf.page
index ebd609b..5a23e9f 100644
--- a/help/de/adf.page
+++ b/help/de/adf.page
@@ -8,10 +8,44 @@
 	<title>Verwendung eines automatischen Dokumenteneinzugs</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.
+    If your scanner features an Automatic Document Feeder (ADF) 
+    you can scan all the pages from the feeder via one of following methods:
     </p>
+      <steps>
+	<title/>
+	<title>Use a Keyboard Shortcut</title>
+	<item>
+	  <p>Press <keyseq><key>Ctrl</key><key>F</key></keyseq></p>
+	</item>      
+      </steps>
+      
+      <steps>
+	<title>Use a Menu</title>
+	<item>
+	  <p>Navigate to <guiseq><gui>Document</gui>
+	  <gui>Scan</gui><gui>All Pages From Feeder</gui></guiseq>.
+	  </p>
+	</item>
+      </steps>
+      
+      <steps>
+	<title>Use the Toolbar Buttons</title>
+	<item>
+	  <p>Click on the arrow to the right of the "Scan" button.</p>
+	</item>
+	<item>
+	  <p>Choose "All Pages From Feeder".</p>
+	  <media type="image" src="figures/scan_toolbar.png"/>
+	</item>
+      </steps>
+    
+    
+    <note style="tip">
     <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.
+    By default, both sides of a sheet will scan if your scanner has this capability.
+    You can choose single side scanning from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
     </p>
+    <media type="image" src="figures/preferences.png"/>
+    </note>
+    
 </page>
diff --git a/help/de/crop.page b/help/de/crop.page
index 16af258..c344ab7 100644
--- a/help/de/crop.page
+++ b/help/de/crop.page
@@ -7,10 +7,38 @@
   
 	<title>Zuschneiden</title>
 
-    <p>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.</p>
-    <p>Sie können den Zuschnittbereich anpassen, indem Sie innerhalb der Umrandung dieses Bereichs mit der Maus klicken und die Maus dann ziehen.</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.
+    The cropping feature in <app>Simple Scan</app> allows you to use only a part of a scanned image. You can
+    enable crop either before or after scanning a page, and you can always change the dimensions of the crop
+    frame. When crop is enabled, a mask will apper over the current page with the area not being used shown
+    in gray. You can enable crop and choose the desired dimensions via one of the following methods:
     </p>
-    <p>Jede neu eingescannte Seite verwendet den Zuschnitt der vorherigen Seite.</p>
+    
+    <steps>
+      <title>Use a Right Click</title>
+      <item><p>Right click anywhere on the image area and select "Crop".</p></item>
+      <item><p>Choose one of the fixed crop frames, or select "Custom" to manually
+	set the crop frame's dimensions by dragging its borders.</p></item>
+      <item><p>Click and hold the frame, then move it to the desired position.</p></item>
+    </steps>
+    
+    <steps>
+      <title>Use a Menu</title>
+      <item><p>Navigate to the <guiseq><gui>Page</gui><gui>Crop</gui></guiseq> menu.</p></item>
+      <item><p>Choose one of the fixed crop frames, or select "Custom" to manually adjust the frame's dimensions by dragging its borders.</p></item>
+      <item><p>Click and hold the frame, then move it to the desired position.</p></item>
+    </steps>
+    
+    <steps>
+      <title>Use the Toolbar</title>
+      <item><p>Click the "<gui>Crop</gui>" button in the toolbar.</p>
+	    <note style="tip"><p>This is the same as choosing "Custom" in step 2 of the
+	      aforementioned methods.</p></note></item>      
+      <item><p>Drag the borders of the frame to set the desired dimensions and position.</p></item>
+
+    </steps>
+    
+    <note><p>
+    Each new scanned page will use the previous crop.
+    </p></note>
 </page>
diff --git a/help/de/dpi.page b/help/de/dpi.page
index e0f14b1..8cc87d9 100644
--- a/help/de/dpi.page
+++ b/help/de/dpi.page
@@ -8,7 +8,49 @@
 	<title>Festlegen der Auflösung</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.
+    The default resolution for document type <gui><em>Text</em></gui> is 150 dpi (dots per inch)
+    and for document type <gui><em>Photo</em></gui> is 300 dpi. You can change these settings
+    from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
     </p>
+    <media type="image" src="figures/preferences.png"/>
+    
+    <p>The available scanning resolutions for both document types (Text and Photo) are the same
+    and are listed in the following table:</p>
+    
+    <table frame="bottom left right" rules="rows cols" shade="rows">
+	<tr>
+		<td><p><em>Text Resolution</em></p></td>
+		<td><p><em>Photo Resolution</em></p></td>
+	</tr>
+	<tr>
+		<td><p>75 dpi (draft)</p></td>
+		<td><p>75 dpi (draft)</p></td>
+	</tr>
+	<tr>
+		<td><p>150 dpi (default)</p></td>
+		<td><p>150 dpi</p></td>
+	</tr>
+	<tr>
+		<td><p>300 dpi</p></td>
+		<td><p>300 dpi (default)</p></td>
+	</tr>
+	<tr>
+		<td><p>600 dpi</p></td>
+		<td><p>600 dpi</p></td>
+	</tr>
+	<tr>
+		<td><p>1200 dpi (high resolution)</p></td>
+		<td><p>1200 dpi (high resolution)</p></td>
+	</tr>
+	<tr>
+		<td><p>2400 dpi</p></td>
+		<td><p>2400 dpi</p></td>
+	</tr>
+    </table>
+    
+    <note style="important"><p><gui><em>Text</em></gui> documents are always scanned in black
+      and white, while <gui><em>Photo</em></gui> documents are always scanned in color, at any
+      resolution!</p>
+    </note>
+
 </page>
diff --git a/help/de/email.page b/help/de/email.page
index a182243..94ce67d 100644
--- a/help/de/email.page
+++ b/help/de/email.page
@@ -8,9 +8,14 @@
 	<title>Per E-Mail versenden</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.
+    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 was set to "Text" the email will have a PDF attachment for each page. 
+    Conversely, if the document type was set to "Photo", the email will have a JPEG
+    attachment for each page.    
     </p>
-    <p>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.</p>
     <p>In <link xref="save"/> finden Sie weitere Informationen über Dateiformate.</p>
 </page>
diff --git a/help/de/index.page b/help/de/index.page
index 9ccc1ca..41137a8 100644
--- a/help/de/index.page
+++ b/help/de/index.page
@@ -6,10 +6,14 @@
 			<name>Robert Ancell</name>
 			<email>robert.ancell@gmail.com</email>
 		</credit>
+		<credit type="author">
+			<name>Ali Shtarbanov</name>
+			<email>ametedinov@gmail.com</email>
+		</credit>
 		<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
 	</info>
 
-	<title>Hilfe zu Simple Scan</title>
+	<title><media type="image" src="figures/icon.png"/> Simple Scan Manual</title>
     
     <section id="acquire" style="2column">
         <title>Scannen von Seiten</title>
@@ -22,4 +26,8 @@
     <section id="use" style="2column">
         <title>Das Dokument verwenden</title>
     </section>
+
+    <section id="shortcuts" style="2column">
+	<title>Simple Scan Shortcuts</title>
+    </section>
 </page>
diff --git a/help/de/print.page b/help/de/print.page
index 1d93167..a2c1dce 100644
--- a/help/de/print.page
+++ b/help/de/print.page
@@ -8,6 +8,22 @@
 	<title>Drucken</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>).
+    <app>Simple Scan</app> allows you print a scanned document directly from the its
+    interface, without having to save the document first. This feature makes <app>Simple
+    Scan</app> a very convenient tool for making copies of documents or photos. 
     </p>
+    <steps>
+      <title>To Print a Document</title>
+      <item>
+	<p>Go to the <guiseq><gui>Document</gui><gui>Print</gui>
+	</guiseq> menu or use the keyboard shortcut <keyseq><key>Ctrl</key><key>P</key></keyseq>.
+	This will open the "Print" dialog box.
+	</p>
+      </item>
+      <item>
+	<p>From the "Print" dialog box choose your desired printing settings and/or Print Preview
+	the document, then press the "Print" button.
+	</p>
+      </item>
+     </steps>
 </page>
diff --git a/help/de/reorder.page b/help/de/reorder.page
index 9963860..d2f8ae4 100644
--- a/help/de/reorder.page
+++ b/help/de/reorder.page
@@ -8,9 +8,13 @@
 	<title>Seiten neu anordnen</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>
+    To move a page, right click on it and choose <gui><em>Move Left</em></gui> or 
+    <gui><em>Move Right</em></gui>.
+    </p> 
+    
     <p>
-    To remove the selected page use the <key>Delete</key> key.
-    </p>
+    Alternatively, you can move a page by first selecting it and then choosing 
+    <gui><em>Move Left</em></gui> or <gui><em>Move Right</em></gui> from the "Page" menu.
+    </p> 
+
 </page>
diff --git a/help/de/rotate.page b/help/de/rotate.page
index 6b8a65d..d717c54 100644
--- a/help/de/rotate.page
+++ b/help/de/rotate.page
@@ -5,10 +5,52 @@
         <link type="guide" xref="index#modify"/>
     </info>
   
-	<title>Seiten drehen</title>
+	<title>Rotating a Page</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.
+    In <app>Simple Scan</app>, you can change the rotation of a page either before or after scanning the page.
+    Currently, there are four ways to rotate a page: 
     </p>
+    
+    <steps>
+      <title>Use Toolbar Buttons</title>
+      <item><p>Select the page you want to rotate by clicking on it once.</p></item>
+      <item><p>Press one of the arrows on the toolbar to rotate the page in the desired direction.</p></item>
+    </steps>
+    <steps>
+      <title>Use Right Click</title>
+      <item><p>Right click on the page you want to rotate.</p></item>
+      <item><p>From the context menu choose "Rotate Left" or "Rotate Right".</p></item>
+    </steps>
+    
+    <steps>
+      <title>Use a Menu</title>
+      <item><p>Select the page you want to rotate by clicking on it once.</p></item>
+      <item><p>Click the "Page" menu and select "Rotate Left" or "Rotate Right".</p></item>
+    </steps>
+    
+    <steps>
+      <title>Use Shortcuts</title>
+      <item><p>Select the page you want to rotate by clicking on it once.</p></item>
+      <item><p>Press one of the following shortcut keys:</p>
+	<table frame="bottom left right" rules="rows cols" shade="rows">
+	<tr>
+		<td><p><em>Command</em></p></td>
+		<td><p><em>Shortcut Key</em></p></td>
+	</tr>
+	<tr>
+		<td><p>Rotate Left</p></td>
+		<td><p><key>[</key> (left bracket)</p></td>
+	</tr>
+	<tr>
+		<td><p>Rotate Right</p></td>
+		<td><p><key>]</key> (right bracket)</p></td>
+	</tr>
+	</table>
+      </item>
+    </steps>
+    
+    <note><p>
+    Each new scanned page will use the previous rotation.
+    </p></note>
 </page>
diff --git a/help/de/save.page b/help/de/save.page
index ab8e6a3..c59a243 100644
--- a/help/de/save.page
+++ b/help/de/save.page
@@ -7,25 +7,61 @@
   
 	<title>Speichern in einer Datei</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>
+    <steps>
       <item>
-        <title>Portable Document Format (PDF)</title>
-        <p>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.</p>
-        <p>Verwenden Sie diesen Typ, wenn Sie mehrere Textseiten eingescannt haben.</p>
+	<p>Navigate to the <guiseq><gui>Document</gui><gui>Save As</gui></guiseq> menu 
+	(or press <keyseq><key>Shift</key><key>Ctrl</key><key>S</key></keyseq>).
+	</p>
       </item>
       <item>
-        <title>JPEG</title>
-        <p>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.</p>
-        <p>Verwenden Sie diesen Typ, wenn Sie die eingescannten Bilder bearbeiten oder hochladen wollen.</p>
+	<p>From the "Save As" dialog box, choose one of the supported file
+	types, or simply change the extension in the "Name" field. 
+	</p>
       </item>
       <item>
-        <title>PNG</title>
-        <p>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.</p>
-        <p>Verwenden Sie diesen Typ, wenn sie hochauflösende Dateien zur Weiterverarbeitung benötigen.</p>
+	<p>Press the "Save" button.</p>
       </item>
-    </terms>
+    </steps>
+    
+    
+<table frame="bottom left right top" rules="rows cols" shade="rows">
+	<title>Supported File Types</title>
+	<tr>
+		<td><p><em>Type</em></p></td>
+		<td><p><em>Brief Description</em></p></td>
+	</tr>
+	<tr>
+		<td><p>PDF</p></td>
+		<td><p>A PDF can contain multiple pages, like a book, and is easy to distribute. Only a small number
+		of linux programs can modify PDF documents, so this format is recommended primarily for archiving.
+		See the <link href="http://en.wikipedia.org/wiki/pdf">PDF Wiki page</link> for more information.
+		    </p></td>
+	</tr>
+	<tr>
+		<td><p>JPEG</p></td>
+		<td><p>JPEG is the file format used by digital cameras to save pictures. A JPEG file is relatively
+		small, very easy to distribute, and suitable for uploading to social networking sites. Most operating
+		systems come with a JPEG editor by default. If you have scanned multiple pages, a JPEG file will be
+		created for each page. Use this file type if you want to modify or upload the scanned images.
+		See the <link href="http://en.wikipedia.org/wiki/jpeg">JPEG Wiki page</link> for more information.
+		    </p></td>
+	</tr>
+	<tr>
+		<td><p>PNG</p></td>
+		<td><p>PNG files contain the raw data from the scanner. This makes them very large and not suitable
+		for distributing. If you have scanned multiple pages, a PNG file will be created for each page.
+		See the <link href="http://en.wikipedia.org/wiki/Portable_Network_Graphics">PNG Wiki page</link>
+		for more information.
+		    </p></td>
+	</tr>
+	<tr>
+		<td><p>TIFF</p></td>
+		<td><p>TIFF files contain the raw data from the scanner. This makes them very large and not suitable
+		for distributing. If you have scanned multipe pages, a TIFF file will be created for each page.
+		See the <link href="http://en.wikipedia.org/wiki/Tagged_Image_File_Format">TIFF Wiki page</link>
+		for more information.
+		    </p></td>
+	</tr>
+
+</table>    
 </page>
diff --git a/help/de/scanner.page b/help/de/scanner.page
index dc6764b..9d51b25 100644
--- a/help/de/scanner.page
+++ b/help/de/scanner.page
@@ -8,11 +8,12 @@
 	<title>Einen Scanner auswählen</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.
+    If you have multiple scanning devices you can change the selected device from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
     </p>
-
+    <media type="image" src="figures/preferences.png"/>
     <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.
+    Your local scanners are automatically detected each time you start <app>Simple Scan</app>
+    and each time you plug in a USB scanner. If you connect a network scanner while <app>Simple Scan</app>
+    is running, you will need to restart <app>Simple Scan</app> for the scanner to be detected.
     </p>
 </page>
diff --git a/help/de/scanning.page b/help/de/scanning.page
index 601c818..5a2caf0 100644
--- a/help/de/scanning.page
+++ b/help/de/scanning.page
@@ -10,34 +10,23 @@
 
     <p>So scannen Sie ein Dokument mit ihrem Scanner ein:</p>
     <steps>
-    <item>
-      <p>Schließen Sie den Scanner an Ihren Rechner an.</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>
+      <item><p>Connect the scanner to your computer and power it on.</p></item>
+      <item><p>Open <app>Simple Scan</app>.</p></item>
+      <item><p>Click the arrow to the right of the "Scan" button and choose the type
+	     of document you are scanning: <em>Photo</em> or <em>Text</em>.</p>
+	     <media type="image" src="figures/scan_toolbar.png"/></item>
+      <item><p>Click the "Scan" button on the toolbar (or press <keyseq><key>Ctrl</key><key>1</key></keyseq>).</p></item>
     </steps>
 
-    <p>Jede Seite wird so angezeigt, wie sie gescannt wurde.</p>
+    <note><p>
+    The page will be shown as it is scanned. To stop the scan at any time press the <key>Esc</key>
+    key on the keyboard. Each page you scan is placed at the end of the document.
+    </p></note>
 
     <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>.
+      The document type can be also be changed from the <guiseq><gui>Document</gui>
+      <gui>Scan</gui></guiseq> menu. Choose <gui><em>Text</em></gui> if you want the document
+      to be quickly scanned in black and white; choose <gui><em>Photo</em></gui> for a high 
+      resolution color scan. See <link xref="dpi"/> for more details and more options.
     </p>
 </page>
diff --git a/install-sh b/install-sh
index a9244eb..377bb86 100755
--- a/install-sh
+++ b/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2011-01-19.21; # UTC
+scriptversion=2011-11-20.07; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -35,7 +35,7 @@ scriptversion=2011-01-19.21; # UTC
 # FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
+# 'make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
@@ -156,7 +156,7 @@ while test $# -ne 0; do
     -s) stripcmd=$stripprog;;
 
     -t) dst_arg=$2
-	# Protect names problematic for `test' and other utilities.
+	# Protect names problematic for 'test' and other utilities.
 	case $dst_arg in
 	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
 	esac
@@ -190,7 +190,7 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
     fi
     shift # arg
     dst_arg=$arg
-    # Protect names problematic for `test' and other utilities.
+    # Protect names problematic for 'test' and other utilities.
     case $dst_arg in
       -* | [=\(\)!]) dst_arg=./$dst_arg;;
     esac
@@ -202,7 +202,7 @@ if test $# -eq 0; then
     echo "$0: no input file specified." >&2
     exit 1
   fi
-  # It's OK to call `install-sh -d' without argument.
+  # It's OK to call 'install-sh -d' without argument.
   # This can happen when creating conditional directories.
   exit 0
 fi
@@ -240,7 +240,7 @@ fi
 
 for src
 do
-  # Protect names problematic for `test' and other utilities.
+  # Protect names problematic for 'test' and other utilities.
   case $src in
     -* | [=\(\)!]) src=./$src;;
   esac
@@ -354,7 +354,7 @@ do
 	      if test -z "$dir_arg" || {
 		   # Check for POSIX incompatibilities with -m.
 		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writeable bit of parent directory when it shouldn't.
+		   # other-writable bit of parent directory when it shouldn't.
 		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
 		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
 		   case $ls_ld_tmpdir in
diff --git a/missing b/missing
index 86a8fc3..cdea514 100755
--- a/missing
+++ b/missing
@@ -1,11 +1,10 @@
 #! /bin/sh
-# Common stub for a few missing GNU programs while installing.
+# Common wrapper for a few potentially missing GNU programs.
 
-scriptversion=2012-01-06.13; # UTC
+scriptversion=2012-06-26.16; # UTC
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,68 +25,40 @@ scriptversion=2012-01-06.13; # UTC
 # the same distribution terms that you use for the rest of that program.
 
 if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
+  echo 1>&2 "Try '$0 --help' for more information"
   exit 1
 fi
 
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
+case $1 in
 
-msg="missing on your system"
+  --is-lightweight)
+    # Used by our autoconf macros to check whether the available missing
+    # script is modern enough.
+    exit 0
+    ;;
 
-case $1 in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
+  --run)
+    # Back-compat with the calling convention used by older automake.
+    shift
+    ;;
 
   -h|--h|--he|--hel|--help)
     echo "\
 $0 [OPTION]... PROGRAM [ARGUMENT]...
 
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
 
 Options:
   -h, --help      display this help and exit
   -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
 
 Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  autom4te     touch the output file, or create a stub one
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
+  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
+  bison     yacc      flex         lex       help2man
 
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
 
 Send bug reports to <bug-automake@gnu.org>."
     exit $?
@@ -99,228 +70,141 @@ Send bug reports to <bug-automake@gnu.org>."
     ;;
 
   -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
+    echo 1>&2 "$0: unknown '$1' option"
+    echo 1>&2 "Try '$0 --help' for more information"
     exit 1
     ;;
 
 esac
 
-# normalize program name to check for.
-program=`echo "$1" | sed '
-  s/^gnu-//; t
-  s/^gnu//; t
-  s/^g//; t'`
-
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).  This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
-  lex*|yacc*)
-    # Not GNU programs, they don't have --version.
-    ;;
-
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case $f in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te*)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison*|yacc*)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if test $# -ne 1; then
-        eval LASTARG=\${$#}
-	case $LASTARG in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f y.tab.h; then
-	echo >y.tab.h
-    fi
-    if test ! -f y.tab.c; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex*|flex*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if test $# -ne 1; then
-        eval LASTARG=\${$#}
-	case $LASTARG in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f lex.yy.c; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit $?
-    fi
-    ;;
-
-  makeinfo*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '
-	/^@setfilename/{
-	  s/.* \([^ ]*\) *$/\1/
-	  p
-	  q
-	}' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-    fi
-    # If the file does not exist, the user really needs makeinfo;
-    # let's fail without touching anything.
-    test -f $file || exit 1
-    touch $file
-    ;;
+# Run the given program, remember its exit status.
+"$@"; st=$?
+
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch.  This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+  msg="probably too old"
+elif test $st -eq 127; then
+  # Program was missing.
+  msg="missing on your system"
+else
+  # Program was found and executed, but failed.  Give up.
+  exit $st
+fi
 
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+  case $1 in
+    aclocal|automake)
+      echo "The '$1' program is part of the GNU Automake package:"
+      echo "<$gnu_software_URL/automake>"
+      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/autoconf>"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+    autoconf|autom4te|autoheader)
+      echo "The '$1' program is part of the GNU Autoconf package:"
+      echo "<$gnu_software_URL/autoconf/>"
+      echo "It also requires GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+  esac
+}
+
+give_advice ()
+{
+  # Normalize program name to check for.
+  normalized_program=`echo "$1" | sed '
+    s/^gnu-//; t
+    s/^gnu//; t
+    s/^g//; t'`
+
+  printf '%s\n' "'$1' is $msg."
+
+  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+  case $normalized_program in
+    autoconf*)
+      echo "You should only need it if you modified 'configure.ac',"
+      echo "or m4 files included by it."
+      program_details 'autoconf'
+      ;;
+    autoheader*)
+      echo "You should only need it if you modified 'acconfig.h' or"
+      echo "$configure_deps."
+      program_details 'autoheader'
+      ;;
+    automake*)
+      echo "You should only need it if you modified 'Makefile.am' or"
+      echo "$configure_deps."
+      program_details 'automake'
+      ;;
+    aclocal*)
+      echo "You should only need it if you modified 'acinclude.m4' or"
+      echo "$configure_deps."
+      program_details 'aclocal'
+      ;;
+   autom4te*)
+      echo "You might have modified some maintainer files that require"
+      echo "the 'automa4te' program to be rebuilt."
+      program_details 'autom4te'
+      ;;
+    bison*|yacc*)
+      echo "You should only need it if you modified a '.y' file."
+      echo "You may want to install the GNU Bison package:"
+      echo "<$gnu_software_URL/bison/>"
+      ;;
+    lex*|flex*)
+      echo "You should only need it if you modified a '.l' file."
+      echo "You may want to install the Fast Lexical Analyzer package:"
+      echo "<$flex_URL>"
+      ;;
+    help2man*)
+      echo "You should only need it if you modified a dependency" \
+           "of a man page."
+      echo "You may want to install the GNU Help2man package:"
+      echo "<$gnu_software_URL/help2man/>"
     ;;
-esac
-
-exit 0
+    makeinfo*)
+      echo "You should only need it if you modified a '.texi' file, or"
+      echo "any other file indirectly affecting the aspect of the manual."
+      echo "You might want to install the Texinfo package:"
+      echo "<$gnu_software_URL/texinfo/>"
+      echo "The spurious makeinfo call might also be the consequence of"
+      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+      echo "want to install GNU make:"
+      echo "<$gnu_software_URL/make/>"
+      ;;
+    *)
+      echo "You might have modified some files without having the proper"
+      echo "tools for further handling them.  Check the 'README' file, it"
+      echo "often tells you about the needed prerequisites for installing"
+      echo "this package.  You may also peek at any GNU archive site, in"
+      echo "case some other package contains this missing '$1' program."
+      ;;
+  esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+                       -e '2,$s/^/         /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
diff --git a/po/LINGUAS b/po/LINGUAS
index 9b14358..bec1a5d 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -3,8 +3,11 @@
 af
 ar
 ast
+az
 bg
+bo
 ca
+ca@valencia
 cs
 da
 de
@@ -16,23 +19,35 @@ et
 eu
 fi
 fr
+gd
 gl
 he
 hr
 hu
+hy
 id
 it
 ja
+kk
+km
+ky
 lt
+lv
+mhr
 ms
+my
 nb
 nl
 oc
+pa
 pl
 pt_BR
 pt
 ro
 ru
+sd
+se
+shn
 sk
 sl
 sq
@@ -44,6 +59,7 @@ tr
 ug
 uk
 ur
+uz
 vi
 zh_CN
 zh_TW
diff --git a/po/af.po b/po/af.po
index 9938980..81034b7 100644
--- a/po/af.po
+++ b/po/af.po
@@ -7,537 +7,590 @@ msgid ""
 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-01-26 22:27+0000\n"
-"Last-Translator: Launchpad Translations Administrators "
-"<rosetta@launchpad.net>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-09-03 08:13+0000\n"
+"Last-Translator: Dawid de Jager <dawid.dejager@gmail.com>\n"
 "Language-Team: Afrikaans <af@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-10-22 04:47+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:44+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr ""
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Eenvoudige Skandeer"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr ""
+msgid "_Document"
+msgstr "_Dokument"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr ""
+msgid "Sc_an"
+msgstr "Sk_andeer"
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr ""
+msgid "Single _Page"
+msgstr "Enkel _Bladsy"
 
 #. 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 "Alle Bladsye Vanaf _Voerder"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr ""
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
-msgstr ""
+msgid "_Stop Scan"
+msgstr "_Staak skandering"
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr ""
+msgid "Text"
+msgstr "Teks"
 
-#. Combo box label for scanning the front side of a page
+#. Combo box label for photo scan mode
 #: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr ""
+msgid "Photo"
+msgstr "Foto"
 
-#. Combo box label for scanning both sides of a page
+#. Label on email menu item
 #: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr ""
+msgid "_Email"
+msgstr "_E-pos"
 
-#. Radio button for cropping to page to US legal size
+#. Page menu (contains action for each page, e.g. delete, crop)
 #: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr ""
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr ""
+msgid "_Page"
+msgstr "_Bladsy"
 
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr ""
+#. Menu item to rotate page to left (anti-clockwise)
+#: ../data/simple-scan.ui.h:22
+msgid "Rotate _Left"
+msgstr "Roteer _linksom"
 
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
-msgid "Photo"
-msgstr ""
+#. Menu item to rotate page to right (clockwise)
+#: ../data/simple-scan.ui.h:24
+msgid "Rotate _Right"
+msgstr "Roteer _regsom"
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr ""
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "_Insny"
 
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
-msgstr ""
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "_Geen"
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr ""
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
 
-#. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
-msgid "Rotate _Left"
-msgstr ""
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
 
-#. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
-msgid "Rotate _Right"
-msgstr ""
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr ""
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "_Letter (VSA)"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr ""
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "Le_gal (VSA)"
 
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr ""
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr ""
+msgid "_Custom"
+msgstr "_Pasmaak"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr ""
+msgid "_Rotate Crop"
+msgstr "_Roteer Insnit"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
+msgid "Move Left"
 msgstr ""
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr ""
+msgid "Move Right"
+msgstr "Beweeg na regs"
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr ""
+msgid "_Help"
+msgstr "_Hulp"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
-msgstr ""
-
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr ""
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr ""
+msgid "_Contents"
+msgstr "_Inhoud"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
-msgstr ""
+msgstr "Begin 'n nuwe dokument"
+
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "Nuwe"
 
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "Skandeer 'n enkelbladsy vanaf die skandeerder"
+
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
-msgstr ""
+msgid "Scan"
+msgstr "Skandeer"
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
-msgid "Stop the current scan"
-msgstr ""
+msgid "Save document to a file"
+msgstr "Stoor dokument na 'n lêer"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr ""
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "Stoor"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
+msgid "Stop the current scan"
+msgstr "Staak huidige skandering"
 
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr ""
+msgid "Stop"
+msgstr "Stop"
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
-msgstr ""
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Roteer die bladsy na links (anti-kloksgewys)"
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr ""
+msgid "Rotate Left"
+msgstr "Roteer linksom"
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr ""
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Roteer die bladsy na regs (kloksgewys)"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr ""
+msgid "Rotate Right"
+msgstr "Roteer regsom"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "Snoei die gekose bladsy"
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
-msgstr ""
+msgid "Crop"
+msgstr "Insny"
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr ""
+msgid "_Username for resource:"
+msgstr "_Gebruikersnaam vir hulpbron:"
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr ""
+msgid "_Password:"
+msgstr "_Wagwoord:"
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr ""
+msgid "_Authorize"
+msgstr "_Verleen toegang"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr ""
+msgid "Preferences"
+msgstr "Voorkeure"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr ""
+msgid "Scan S_ource:"
+msgstr "Skandeer B_ron"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
-msgstr ""
+msgid "_Text Resolution:"
+msgstr "_Teks resolusie"
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr ""
+msgid "_Photo Resolution:"
+msgstr "_Foto resolusie:"
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
-msgstr ""
+msgid "Scan Side:"
+msgstr "Skandeer Kant:"
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
-msgstr ""
+msgid "Page Size:"
+msgstr "Bladsy grootte:"
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
+msgid "Brightness:"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
-msgstr ""
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "Voor en agter"
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
-msgstr ""
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "Voor"
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
-msgstr ""
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "Terug"
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr ""
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "Skandeer dokumente"
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "Venster wydte in pixels"
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "Venster hoogte in pixels"
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "Skanderingstoestel"
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "Tipe dokument wat geskandeer word"
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "Skanderingsrigting"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "Wydte van geskandeerde beeld in pixels"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
 msgstr ""
+"Die wydte van geskandeerde beeld in pixels. Die waarde is verstel na die "
+"waarde van die laaste geskandeerde bladsy."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "Hoogte van geskandeerde beeld in pixels"
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
 msgstr ""
+"Die hoogte van geskandeerde beeld in pixels. Die waarde is verander na die "
+"waarde van die laaste geskandeerde bladsy."
 
-#: ../data/simple-scan.schemas.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "Wydte van papier in tiendes van 'n mm"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
+"Die wydte van die papier in tiendes van 'n mm (of 0 vir outomatiese "
+"bespeuring)"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "Hoogte van papier in tiendes van 'n mm"
 
-#: ../data/simple-scan.schemas.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
 msgstr ""
+"Die hoogte van die papier in tiendes van 'n mm (of 0 vir outomatiese "
+"papierbespeuring)"
 
-#: ../data/simple-scan.schemas.in.h:17
-msgid "The resolution in dots-per-inch of the previously scanned image."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:19
-msgid "The resolution in dots-per-inch to use when scanning text."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "Resolusie van die laaste geskandeerde beeld"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
+msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "Resolusie van geskandeerde teks"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "Resolusie van geskandeerde foto's"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "Kant van bladsy om te skandeer"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "Gids om lêers in te stoor"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
+"Die gids om die lêers in stoor. Verstek is die dokumente gids indien "
+"onveranderd"
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
-msgstr ""
+msgstr "Geen skandeerders is beskikbaar nie. Koppel asb.'n skandeerder."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
-msgstr ""
+msgstr "Kan nie aan skandeerder koppel nie"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
-msgstr ""
+msgstr "Nie in staat om te begin skandeer nie"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
 msgstr ""
 
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr ""
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr ""
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
-msgstr ""
+msgstr "Skandering het misluk"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
-msgstr ""
+msgstr "Geskandeerde dokument"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
+msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
-#, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
-msgstr ""
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "Geskandeerde dokument.pdf"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr ""
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr ""
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr ""
-
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
-msgstr ""
+msgstr "Stoor as..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
-msgstr ""
+msgstr "Beeldlêers"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
-msgstr ""
+msgstr "Alle lêers"
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
 msgstr ""
 
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr ""
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr ""
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
-msgstr ""
+msgstr "Kon nie die leêr stoor nie"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
 msgstr ""
 
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr ""
+
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -554,75 +607,124 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
-msgstr ""
+msgstr "Aangaande Simple Scan"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Jacques Botha https://launchpad.net/~jacquesb"
+"  Arthur Rilke https://launchpad.net/~arthurrilke\n"
+"  Chris Mostert https://launchpad.net/~cvmostert\n"
+"  Dawid de Jager https://launchpad.net/~dawiddj\n"
+"  Jacques Botha https://launchpad.net/~jacquesb\n"
+"  Johann-jlconradie https://launchpad.net/~johann-jlconradie\n"
+"  Launchpad Translations Administrators https://launchpad.net/~rosetta\n"
+"  Willem van der Colff https://launchpad.net/~wilalla"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
 msgstr ""
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
 #, c-format
-msgid "%d dpi (draft)"
-msgstr ""
+msgid "%d dpi (default)"
+msgstr "%d dpi (verstek resolusie)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1292
 #, c-format
-msgid "%d dpi"
+msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
-msgstr ""
+msgstr "%d dpi (hoë resolusie)"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
-msgstr ""
+msgid "%d dpi"
+msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
 msgstr ""
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
-msgstr ""
+msgstr "Kontrolleer asseblief u installasie"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
-msgstr ""
+msgstr "Verander _skandeerder"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
 msgstr ""
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr ""
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr ""
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr ""
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr ""
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr ""
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr ""
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr ""
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "Gebruik:\n"
+#~ "%s [TOESTEL...] - Skandeerder"
diff --git a/po/ar.po b/po/ar.po
index a81e994..7b41fcf 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,323 +7,346 @@ msgid ""
 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-04-19 09:51+0000\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-07-23 08:56+0000\n"
 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic <ar@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-10-22 04:47+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:44+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4&#×D7;6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "الماسحة الضوئية"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr "A_4"
+msgid "_Document"
+msgstr "م_ستند"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr "امسح"
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "صفحة مفردة"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:10
 msgid "All Pages From _Feeder"
 msgstr "كل الصفحات من  _المغذّي"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr ""
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
-msgstr "قص"
+msgid "_Stop Scan"
+msgstr "أو_قف المسح"
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr "اقتطع الصفحة المحددة"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr ""
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr ""
-
-#. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr "_قانوني"
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr "جديد"
-
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr ""
+msgid "Text"
+msgstr "نص"
 
 #. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
+#: ../data/simple-scan.ui.h:16
 msgid "Photo"
 msgstr "صورة"
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr "التفضيلات"
-
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
-msgstr "أدر يسارا"
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr "_بريد إلكتروني"
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr "أدر يمينا"
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr "_صفحة"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
+#: ../data/simple-scan.ui.h:22
 msgid "Rotate _Left"
 msgstr "أدر  ي_سارًا"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
+#: ../data/simple-scan.ui.h:24
 msgid "Rotate _Right"
 msgstr "أدر ي_مينًا"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "أدر الصفحة لليسار(عكس عقارب الساعة)"
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "ا_قتصاص"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr "أدر الصفحة لليمين (مع عقارب الساعة)"
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "لا _شيء"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
 
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "_خطاب"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "_قانوني"
+
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr "احفظ"
+msgid "4&#xD7;6"
+msgstr "4&#×D7;6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr ""
+msgid "_Custom"
+msgstr "_مخصص"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr "امسح"
+msgid "_Rotate Crop"
+msgstr "أ_در الاقتصاص"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
-msgstr "امسح"
+msgid "Move Left"
+msgstr "تحرك لليسار"
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr "م_صدر المسح:"
+msgid "Move Right"
+msgstr "تحرك لليمين"
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr ""
+msgid "_Help"
+msgstr "_مساعدة"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
-msgstr "امسح صفحة مفردة من الماسحة"
-
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr "مسح بسيط"
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr "صفحة مفردة"
+msgid "_Contents"
+msgstr "ال_محتويات"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
 msgstr "ابدأ مستندا جديدا"
 
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "جديد"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "امسح صفحة مفردة من الماسحة"
+
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
-msgstr "أوقف"
+msgid "Scan"
+msgstr "امسح"
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr "احفظ المستند في ملف"
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "احفظ"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
 msgid "Stop the current scan"
 msgstr "أوقف المسح الحالي"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr "نص"
-
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr "_خوّل"
+msgid "Stop"
+msgstr "أوقف"
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
-msgstr "ال_محتويات"
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "أدر الصفحة لليسار (عكس عقارب الساعة)"
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr "_قص"
+msgid "Rotate Left"
+msgstr "أدر يسارا"
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr "_مخصص"
+msgid "Rotate the page to the right (clockwise)"
+msgstr "أدر الصفحة لليمين (مع عقارب الساعة)"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr "م_ستند"
+msgid "Rotate Right"
+msgstr "أدر يمينا"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "اقتص الصفحة المحددة"
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
-msgstr "_بريد إلكتروني"
+msgid "Crop"
+msgstr "اقتصاص"
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr "_مساعدة"
+msgid "_Username for resource:"
+msgstr "اسم _مستخدم المورد:"
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr "_خطاب"
+msgid "_Password:"
+msgstr "_كلمة السر:"
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr "لا _شيء"
+msgid "_Authorize"
+msgstr "_خوّل"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr "_صفحة"
+msgid "Preferences"
+msgstr "التفضيلات"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr "_كلمة السر:"
+msgid "Scan S_ource:"
+msgstr "م_صدر المسح:"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
-msgstr "ميز ال_ صورة:"
+msgid "_Text Resolution:"
+msgstr "ميز ال_نص"
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr "أ_در القص"
+msgid "_Photo Resolution:"
+msgstr "ميز ال_صورة:"
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
-msgstr "أو_قف المسح"
+msgid "Scan Side:"
+msgstr "جهة المسح:"
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
-msgstr "ميز ال_نص"
+msgid "Page Size:"
+msgstr "حجم الصفحة:"
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
-msgstr "اسم _مستخدم المورد:"
+msgid "Brightness:"
+msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
-msgstr "امسح المستندات"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
-msgstr "الجهاز الذي سيمسح منه"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
-msgstr "اتجاه المسح"
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "الخلف والأمام"
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
-msgstr "دليل حفظ الملفات"
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "الأمام"
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
-msgstr ""
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "الخلف"
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr "ارتفاع الصورة الممسوحة بالبكسل"
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "امسح المستندات"
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "عرض النافذة بالبكسل"
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
-msgstr "ميز مسح الصور"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "ارتفاع النافذة بالبكسل"
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
-msgstr "ميز مسح النصوص"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "صحيح إن كانت نافذة البرنامج مكبرة"
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
-msgstr "ميز آخر صورةممسوحة"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "الجهاز الذي سيمسح منه"
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
 msgstr "جهاز SANE  للحصول على الصور منه."
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
-msgstr "صحيح إن كانت نافذة البرنامج مكبرة"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "نوع المستند الذي يجري مسحه"
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
-"اتجاه الماسحة  عبر الصفحة الممسوحة . يمكن أن يكون: 'top-to-bottom' 'bottom-"
-"to-top' 'left-to-right' 'right-to-left'"
+"نوع المستند الممسوح. هذا الإعداد يتقرر على أساس ميز المسح، والألوان، ومرحلة "
+"ما بعد المعاجلة."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "اتجاه المسح"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "اتجاه الماسحة خلال الصفحة الممسوحة."
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "عرض الصورة الممسوحة بالبكسل."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr "الدليل الذي ستحفظ به الملفات. يستخدم دليل المستندات إذا لم يحدد هنا."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
+msgstr ""
+"عرض الصورة الممسوحة بالبكسل. تحدث هذه القيمة حسب ما كانت عليه الصورة السابقة."
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "ارتفاع الصورة الممسوحة بالبكسل"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
@@ -331,219 +354,238 @@ msgstr ""
 "ارتفاع الصورة الممسوحة بالبكسل. تحدث هذه القيمة حسب ما كانت عليه الصورة "
 "السابقة."
 
-#: ../data/simple-scan.schemas.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "عرض الورقة بأعشار الملم"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr "عرض الورقة بأعشار الملم (أو 0 لاكتشاف الورقة آليا)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "ارتفاع الورقة بأعشار الملم"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
+msgstr "ارتفاع الورقة بأعشار الملم (أو 0 لاكتشاف الورقة آليا)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:16
-msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "ميز آخر صورة ممسوحة"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
 msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr "الميز بالنقطة في البوصة للصورة الممسوحة سابقا."
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "الميز بالنقطة في البوصة الذي سيستخدم عند مسح الصور."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "ميز مسح النصوص"
 
-#: ../data/simple-scan.schemas.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "الميز بالنقطة في البوصة الذي سيستخدم عند مسح النصوص."
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"عرض الصورة الممسوحة بالبكسل. تحدث هذه القيمة حسب ما كانت عليه الصورة السابقة."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "ميز مسح الصور"
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "الميز بالنقطة في البوصة الذي سيستخدم عند مسح الصور."
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
-msgstr "نوع المستند الذي يجري مسحه"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "الجهة التي ستُمسح"
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
-msgstr ""
-"نوع المستند الذي يجري مسحه. 'text' للمستندات النصية، 'photo' للصور. يحدد هذا "
-"الإعداد دقة المسح والألوان والمعالجة البعدية."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "جهة الصفحة التي ستُمسح."
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "دليل حفظ الملفات"
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
-msgstr "عرض الصورة الممسوحة بالبكسل."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr "الدليل الذي ستحفظ به الملفات. يستخدم دليل المستندات إذا لم يحدد هنا."
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
-msgstr "ارتفاع النافذة بالبكسل"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
-msgstr "عرض النافذة بالبكسل"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
 msgstr "لا توجد أي ماسحات. من فضلك وصّل ماسحة."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
 msgstr "تعذّر الاتصال بالماسحة"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
 msgstr "تعذّر بدء المسح"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
 msgstr "خطأ في التواصل مع الماسحة"
 
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "اعرض رقم الإصدارة"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "اطبع رسائل التنقيح"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr "أصلح ملفات PDF المولدة باستخدام إصدارات قديمة من الماسحة الضوئية"
+
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
 msgstr "فشل المسح"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
 msgstr "مستند ممسوح"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
-msgstr ""
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[جهاز...] - أداة مسح ضوئي"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
-msgstr ""
+msgid "Run '%s --help' to see a full list of available command line options."
+msgstr "نفّذ '%s --help' لعرض القائمة الكاملة لخيارات سطر الأوامر المُتاحة."
 
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
-#, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
-msgstr ""
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "مستند ممسوح.pdf"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "اسم مستخدم وكلمة سر مطلوبين للنفاذ إلى '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
 msgstr "لم يُعثر على أي ماسحة"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
-msgstr "يرجى التحقق من أنّ الماسحة متصلة و تعمل"
-
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr "PDF‏ (مستند متعدد الصفحات)"
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr "‏JPEG (مضغوط)"
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr "‏PNG (غير فقود)"
+msgstr "يرجى التحقق من أنّ الماسحة متصلة وتعمل"
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
 msgstr "احفظ كـ..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
 msgstr "ملفات الصور"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
 msgstr "كل الملفات"
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
 msgstr "اختر _نوع الملف"
 
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF‏ (مستند متعدد الصفحات)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "‏JPEG (مضغوط)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "‏PNG (غير فقود)"
+
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
 msgstr "فشل حفظ الملف"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
-msgstr ""
+msgstr "ستضيع جميع التغييرات للأبد إذا لم تحفظ."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
-msgstr ""
+msgstr "أأحفظ المستند الحالي؟"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
-msgstr ""
+msgstr "ارفض التغيرات"
+
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "تعذّر حفظ الصورة للمعاينة"
 
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
 msgstr "تعذر فتح معاين الصور"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
 msgstr "تعذّر فتح ملف المساعدة"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -570,77 +612,134 @@ msgstr ""
 "إذا لم يحدث هذا فانظر <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
-msgstr "عن \"المسح البسيط\""
+msgstr "عن \"الماسحة الضوئية\""
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
 msgstr "أداة بسيطة لمسح المستندات"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
+"  Ahmed Mohammed https://launchpad.net/~ahmedqatar\n"
+"  Ali AlNoaimi https://launchpad.net/~el7r\n"
+"  Ibrahim Saed https://launchpad.net/~ibraheem5000\n"
 "  Kaïs Bejaoui https://launchpad.net/~kais\n"
 "  Khaled Hosny https://launchpad.net/~khaledhosny\n"
-"  benohb https://launchpad.net/~hamid"
+"  Usama Akkad https://launchpad.net/~damascene\n"
+"  abdallah alemran https://launchpad.net/~abukhallad\n"
+"  benohb https://launchpad.net/~hamid\n"
+"  hitham https://launchpad.net/~hitham-mil\n"
+"  rashed alhazimi https://launchpad.net/~linex"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
-msgstr ""
+msgstr "هل ترغب بحفظ المستند قبل الخروج؟"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
-msgstr ""
+msgstr "أُخرج دون حفظ"
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d نقطة\\بوصة (مبدئي)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#: ../src/ui.vala:1292
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d نقطة\\بوصة (مسودة)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
-#, c-format
-msgid "%d dpi"
-msgstr "%d نقطة\\بوصة"
-
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d نقطة\\بوصة (دقة عالية)"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
-msgstr "%d نقطة\\بوصة (مبدئي)"
+msgid "%d dpi"
+msgstr "%d نقطة\\بوصة"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
 msgstr "ملفات مفقودة"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
 msgstr "من فضلك تحقق من تثبيتك"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
 msgstr "غيّر _الماسحة"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
+msgstr "آلي"
+
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
 msgstr ""
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
-msgstr "مستند ممسوح.pdf"
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr ""
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr ""
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr ""
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr ""
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr ""
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "يحفظ المستند..."
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "يحفظ الصفحة %d من أصل %d"
+
+#~ msgid ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ msgstr ""
+#~ "اتجاه الماسحة  عبر الصفحة الممسوحة . يمكن أن يكون: 'top-to-bottom' 'bottom-"
+#~ "to-top' 'left-to-right' 'right-to-left'"
+
+#~ msgid ""
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
+#~ msgstr ""
+#~ "نوع المستند الذي يجري مسحه. 'text' للمستندات النصية، 'photo' للصور. يحدد هذا "
+#~ "الإعداد دقة المسح والألوان والمعالجة البعدية."
diff --git a/po/ast.po b/po/ast.po
index 3907ff3..fef4d5d 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -7,549 +7,584 @@ msgid ""
 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-01-26 22:27+0000\n"
-"Last-Translator: Launchpad Translations Administrators "
-"<rosetta@launchpad.net>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-07-23 08:57+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Asturian <ast@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-10-22 04:47+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:44+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Simple Scan"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr "A_4"
+msgid "_Document"
+msgstr "_Documentu"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr ""
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "U_na páxina"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:10
 msgid "All Pages From _Feeder"
 msgstr "Tol_es páxines dende l'alimentador"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr ""
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
+msgid "_Stop Scan"
 msgstr ""
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr ""
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr ""
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr ""
-
-#. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr "Lle_gal"
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr ""
-
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr ""
+msgid "Text"
+msgstr "Testu"
 
 #. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
+#: ../data/simple-scan.ui.h:16
 msgid "Photo"
 msgstr "Semeya"
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr "Preferencies"
-
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
 msgstr ""
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr ""
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr "_Páxina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
+#: ../data/simple-scan.ui.h:22
 msgid "Rotate _Left"
 msgstr "Voltiar a la e_squierda"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
+#: ../data/simple-scan.ui.h:24
 msgid "Rotate _Right"
 msgstr "Voltiar a la _Drecha"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr ""
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "_Recortar"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr ""
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "_Dengún"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "_Carta"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "Lle_gal"
 
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr ""
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr ""
+msgid "_Custom"
+msgstr "_Personalizáu"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr ""
+msgid "_Rotate Crop"
+msgstr "_Voltiar recorte"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
+msgid "Move Left"
 msgstr ""
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr "Escan_ear:"
+msgid "Move Right"
+msgstr ""
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr ""
+msgid "_Help"
+msgstr "_Aida"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
+msgid "_Contents"
 msgstr ""
 
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr "Simple Scan"
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr "U_na páxina"
-
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
 msgstr ""
 
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr ""
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr ""
+
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
+msgid "Scan"
 msgstr ""
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
-msgid "Stop the current scan"
+msgid "Save document to a file"
 msgstr ""
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr "Testu"
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr ""
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
+msgid "Stop the current scan"
+msgstr ""
 
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr "_Autorizar"
+msgid "Stop"
+msgstr ""
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
+msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr "_Recortar"
+msgid "Rotate Left"
+msgstr ""
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr "_Personalizáu"
+msgid "Rotate the page to the right (clockwise)"
+msgstr ""
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr "_Documentu"
+msgid "Rotate Right"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr ""
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
+msgid "Crop"
 msgstr ""
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr "_Aida"
+msgid "_Username for resource:"
+msgstr "_Nome d'usuariu pal recursu:"
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr "_Carta"
+msgid "_Password:"
+msgstr "_Contraseña"
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr "_Dengún"
+msgid "_Authorize"
+msgstr "_Autorizar"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr "_Páxina"
+msgid "Preferences"
+msgstr "Preferencies"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr "_Contraseña"
+msgid "Scan S_ource:"
+msgstr "Escan_ear:"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
+msgid "_Text Resolution:"
 msgstr ""
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr "_Voltiar recorte"
+msgid "_Photo Resolution:"
+msgstr ""
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
+msgid "Scan Side:"
 msgstr ""
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
+msgid "Page Size:"
 msgstr ""
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
-msgstr "_Nome d'usuariu pal recursu:"
+msgid "Brightness:"
+msgstr "Brillu:"
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
-msgstr ""
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr "Contraste:"
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
-msgstr ""
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr "Calidá:"
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
+"Triba de documentu escaneándose. Esta configuración afita la resolución "
+"d'escanéu, colores y post-procesamientu."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "La direición del escáner a traviés de la páxina escaneada."
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 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
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr "Brillu d'escanéu"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Axuste del brillu dende -100 a 100 (siendo 0 ensin axuste)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr "Contraste del escanéu"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Axuste de contraste dende -100 a 100 (siendo 0 ensin axuste)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
 msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "El llau de la páxina a escanear."
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr "Calidá de la compresión de JPEG"
 
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr "Calidá de la compresión de JPEG."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
 msgstr "Nun puede coneutase col escáner"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
 msgstr "Nun puede anicase l'escáner"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
 msgstr "Fallu de comunicación col escáner"
 
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Amosar versión"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Amosar mensaxes de depuración"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr "Iguar ficheros PDF con versiones anteriores de Simple Scan"
+
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
 msgstr "Falló al escanerr"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
 msgstr ""
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
-msgstr ""
-"Usu:\n"
-"  %s [DEVICE...] - Scanning utility"
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[PRESÉU...] - Utilidá d'escanéu"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
+msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
+"Executa '%s --help' pa ver una llista completa de les opciones disponibles "
+"na llinia de comandos."
 
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
-#, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
-msgstr ""
-"Opciones de GTK+:\n"
-"  --class=CLASE                   Clas de programa como s'usa pol xestor de "
-"ventanes\n"
-"  --name=NOME                   Nome del programa como s'usa pol xestor de "
-"ventanes\n"
-"  --screen=PANTALLA               Pantalla X qu'usar\n"
-"  --sync                          Facer que les llamaes les X seyan "
-"síncrones\n"
-"  --gtk-module=MÓDULOS            Cargar módulos GTK+ adicionales\n"
-"  --g-fatal-warnings              Facer que tolos avisos seyan fatales"
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "Documentu Escaneáu.pdf"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Requierse nome d'usuariu y contraseña p'acceder a '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
 msgstr "Nun se deteutó dengún escáner"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
 msgstr "Por favor comprueba que l'escáner ta coneutáu y activáu"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr ""
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr ""
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr ""
-
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
 msgstr "Guardar como..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
 msgstr ""
 
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr ""
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr ""
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
 msgstr "Falló al guardar el ficheru"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
 msgstr ""
 
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "Nun pudo guardase la imaxe de previsualización"
+
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -578,75 +613,144 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
 msgstr "Tocante a Simple Scan"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
 msgstr "Una cenciella ferramienta pa escanear documentos"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Iñigo Varela https://launchpad.net/~ivarela"
+"  Launchpad Translations Administrators https://launchpad.net/~rosetta\n"
+"  Rodrigo Toraño Valle https://launchpad.net/~rodrigo-torval\n"
+"  Xuacu Saturio https://launchpad.net/~xuacusk8\n"
+"  ivarela https://launchpad.net/~ivarela"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
 msgstr ""
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
 #, c-format
-msgid "%d dpi (draft)"
+msgid "%d dpi (default)"
 msgstr ""
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1292
 #, c-format
-msgid "%d dpi"
+msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
+msgid "%d dpi"
 msgstr ""
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
 msgstr "Ficheros non alcontraos"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
 msgstr "Por favor, comprueba la instalación"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
-msgstr "Documentu Escaneáu.pdf"
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr "Más escuru"
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr "Más claru"
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr "Menos"
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr "Más"
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr "Mínimu"
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr "Máximu"
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "Guardando documentu..."
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "Guardando la páxina %d de %d"
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "Usu:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "Opciones de GTK+:\n"
+#~ "  --class=CLASE                   Clas de programa como s'usa pol xestor de "
+#~ "ventanes\n"
+#~ "  --name=NOME                   Nome del programa como s'usa pol xestor de "
+#~ "ventanes\n"
+#~ "  --screen=PANTALLA               Pantalla X qu'usar\n"
+#~ "  --sync                          Facer que les llamaes les X seyan "
+#~ "síncrones\n"
+#~ "  --gtk-module=MÓDULOS            Cargar módulos GTK+ adicionales\n"
+#~ "  --g-fatal-warnings              Facer que tolos avisos seyan fatales"
diff --git a/po/az.po b/po/az.po
new file mode 100644
index 0000000..8729f5a
--- /dev/null
+++ b/po/az.po
@@ -0,0 +1,706 @@
+# Azerbaijani translation for simple-scan
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the simple-scan package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: simple-scan\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-04-17 06:12+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"Language-Team: Azerbaijani <az@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: 2013-09-13 05:44+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
+
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr ""
+
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: ../data/simple-scan.ui.h:4
+msgid "_Document"
+msgstr ""
+
+#. Scan menu item
+#: ../data/simple-scan.ui.h:6
+msgid "Sc_an"
+msgstr ""
+
+#. Toolbar scan menu item to scan a single page from the scanner
+#: ../data/simple-scan.ui.h:8
+msgid "Single _Page"
+msgstr ""
+
+#. Toolbar scan menu item to scan all pages from a document feeder
+#: ../data/simple-scan.ui.h:10
+msgid "All Pages From _Feeder"
+msgstr "_AvtoYükləmədəki bütün səhifələr"
+
+#. Menu entry to stop current scan
+#: ../data/simple-scan.ui.h:12
+msgid "_Stop Scan"
+msgstr ""
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:14
+msgid "Text"
+msgstr ""
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:16
+msgid "Photo"
+msgstr ""
+
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr ""
+
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr ""
+
+#. Menu item to rotate page to left (anti-clockwise)
+#: ../data/simple-scan.ui.h:22
+msgid "Rotate _Left"
+msgstr ""
+
+#. Menu item to rotate page to right (clockwise)
+#: ../data/simple-scan.ui.h:24
+msgid "Rotate _Right"
+msgstr ""
+
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr ""
+
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr ""
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr ""
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr ""
+
+#. Radio button for cropping page to 4x6 inch
+#: ../data/simple-scan.ui.h:40
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
+
+#. Radio button for cropping to custom page size
+#: ../data/simple-scan.ui.h:42
+msgid "_Custom"
+msgstr ""
+
+#. Menu item to rotate the crop area
+#: ../data/simple-scan.ui.h:44
+msgid "_Rotate Crop"
+msgstr ""
+
+#. Menu item to move the selected page to the left
+#: ../data/simple-scan.ui.h:46
+msgid "Move Left"
+msgstr ""
+
+#. Menu item to move the selected page to the right
+#: ../data/simple-scan.ui.h:48
+msgid "Move Right"
+msgstr ""
+
+#. Label on help menu
+#: ../data/simple-scan.ui.h:50
+msgid "_Help"
+msgstr ""
+
+#. Help|Contents menu
+#: ../data/simple-scan.ui.h:52
+msgid "_Contents"
+msgstr ""
+
+#. Tooltip for new document button
+#: ../data/simple-scan.ui.h:54
+msgid "Start a new document"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr ""
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr ""
+
+#. Label on scan toolbar item
+#: ../data/simple-scan.ui.h:59
+msgid "Scan"
+msgstr ""
+
+#. Tooltip for save toolbar button
+#: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr ""
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
+msgid "Stop the current scan"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:65
+msgid "Stop"
+msgstr ""
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: ../data/simple-scan.ui.h:67
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr ""
+
+#. Label on rotate page left (anti-clockwise) item
+#: ../data/simple-scan.ui.h:69
+msgid "Rotate Left"
+msgstr ""
+
+#. Tooltip for rotate right (clockwise) button
+#: ../data/simple-scan.ui.h:71
+msgid "Rotate the page to the right (clockwise)"
+msgstr ""
+
+#. Label on rotate page right (clockwise) item
+#: ../data/simple-scan.ui.h:73
+msgid "Rotate Right"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "Seçilmiş səhifəni kəs"
+
+#: ../data/simple-scan.ui.h:75
+msgid "Crop"
+msgstr "Kəs"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:77
+msgid "_Username for resource:"
+msgstr ""
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:79
+msgid "_Password:"
+msgstr ""
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:81
+msgid "_Authorize"
+msgstr ""
+
+#. Title of preferences dialog
+#: ../data/simple-scan.ui.h:83
+msgid "Preferences"
+msgstr ""
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:85
+msgid "Scan S_ource:"
+msgstr ""
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:87
+msgid "_Text Resolution:"
+msgstr ""
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:89
+msgid "_Photo Resolution:"
+msgstr ""
+
+#. Label beside scan side combo box
+#: ../data/simple-scan.ui.h:91
+msgid "Scan Side:"
+msgstr ""
+
+#. Label beside page size combo box
+#: ../data/simple-scan.ui.h:93
+msgid "Page Size:"
+msgstr ""
+
+#. Label beside brightness scale
+#: ../data/simple-scan.ui.h:95
+msgid "Brightness:"
+msgstr ""
+
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr ""
+
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr ""
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "Hər iki üz"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "Ön"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "Geri"
+
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+msgid "SANE device to acquire images from."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
+msgid ""
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
+msgid ""
+"The height of scanned image in pixels. This value is updated to what the "
+"last scanned page was."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
+msgid "The resolution in dots-per-inch of the previously scanned image."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr ""
+
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:814
+msgid "No scanners available.  Please connect a scanner."
+msgstr ""
+
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:844
+msgid "Unable to connect to scanner"
+msgstr ""
+
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1207
+msgid "Unable to start scan"
+msgstr ""
+
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+msgid "Error communicating with scanner"
+msgstr ""
+
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr ""
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr ""
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:297
+msgid "Failed to scan"
+msgstr ""
+
+#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
+#: ../src/simple-scan.vala:316
+msgid "Scanned Document"
+msgstr ""
+
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr ""
+
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
+#, c-format
+msgid "Run '%s --help' to see a full list of available command line options."
+msgstr ""
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr ""
+
+#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
+#: ../src/ui.vala:159
+#, c-format
+msgid "Username and password required to access '%s'"
+msgstr ""
+
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:202
+msgid "No scanners detected"
+msgstr ""
+
+#. Hint to user on why there are no scanners detected
+#: ../src/ui.vala:204
+msgid "Please check your scanner is connected and powered on"
+msgstr ""
+
+#. Save dialog: Dialog title
+#: ../src/ui.vala:363
+msgid "Save As..."
+msgstr ""
+
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:377
+msgid "Image Files"
+msgstr ""
+
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:383
+msgid "All Files"
+msgstr ""
+
+#. 
+#: ../src/ui.vala:388
+msgid "Select File _Type"
+msgstr ""
+
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr ""
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr ""
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr ""
+
+#. Title of error dialog when save failed
+#: ../src/ui.vala:503
+msgid "Failed to save file"
+msgstr ""
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:526
+msgid "If you don't save, changes will be permanently lost."
+msgstr ""
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:563
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:565
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.vala:872
+msgid "Unable to open image preview application"
+msgstr ""
+
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1119
+msgid "Unable to open help file"
+msgstr ""
+
+#. The license this software is under (GPL3+)
+#: ../src/ui.vala:1130
+msgid ""
+"This program is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 3 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program.  If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+
+#. Title of about dialog
+#: ../src/ui.vala:1133
+msgid "About Simple Scan"
+msgstr ""
+
+#. Description of program
+#: ../src/ui.vala:1136
+msgid "Simple document scanning tool"
+msgstr ""
+
+#: ../src/ui.vala:1145
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Emin Mastizada https://launchpad.net/~emin25"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1156
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1158
+msgid "Quit without Saving"
+msgstr ""
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr ""
+
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1292
+#, c-format
+msgid "%d dpi (draft)"
+msgstr ""
+
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1295
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr ""
+
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
+#, c-format
+msgid "%d dpi"
+msgstr ""
+
+#. Title of dialog when cannot load required files
+#: ../src/ui.vala:1333
+msgid "Files missing"
+msgstr ""
+
+#. Description in dialog when cannot load required files
+#: ../src/ui.vala:1335
+msgid "Please check your installation"
+msgstr ""
+
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1403
+msgid "Change _Scanner"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1409
+msgid "Automatic"
+msgstr ""
+
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr ""
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr ""
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr ""
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr ""
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr ""
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr ""
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr ""
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr ""
diff --git a/po/bg.po b/po/bg.po
index 21c14ad..3307a62 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,325 +7,347 @@ msgid ""
 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-10-17 15:16+0000\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-12-01 09:04+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-10-22 04:47+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:44+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Опростено сканиране"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr "A_4"
+msgid "_Document"
+msgstr "_Документ"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr "Ска_ниране"
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "Единична страница"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:10
 msgid "All Pages From _Feeder"
 msgstr "Всички страници от _подавача"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr "Обратна страна"
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
-msgstr "Отрязване"
+msgid "_Stop Scan"
+msgstr "_Спиране на сканирането"
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr "Отрязва избраната страница"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr "Предна страна"
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr "Предна и обратна страна"
-
-#. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr "Le_gal"
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr "Нов"
-
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr "Размер на листа:"
+msgid "Text"
+msgstr "Текст"
 
 #. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
+#: ../data/simple-scan.ui.h:16
 msgid "Photo"
 msgstr "Снимка"
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr "Настройки"
-
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
-msgstr "Завъртане наляво"
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr "_Електронна поща"
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr "Завъртане надясно"
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr "_Страница"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
+#: ../data/simple-scan.ui.h:22
 msgid "Rotate _Left"
 msgstr "Завъртане _наляво"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
+#: ../data/simple-scan.ui.h:24
 msgid "Rotate _Right"
 msgstr "Завъртане на_дясно"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Завъртане страницата на ляво (обратно на часовниковата стрелка)"
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "И_зрязване"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Завъртане страницата на дясно (по часовниковата стрелка)"
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "_Нищо"
 
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "_Letter"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "Le_gal"
+
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr "Запазване"
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr "Запис на документа като файл"
+msgid "_Custom"
+msgstr "_Потребителско"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr "Ска_ниране"
+msgid "_Rotate Crop"
+msgstr "_Завъртане на изрязването"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
-msgstr "Сканиране"
+msgid "Move Left"
+msgstr "Преместване наляво"
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr "Източник"
+msgid "Move Right"
+msgstr "Преместване надясно"
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr "Избор на страна за сканиране:"
+msgid "_Help"
+msgstr "_Помощ"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
-msgstr "Сканиране на"
-
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr "Опростено сканиране"
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr "Единична страница"
+msgid "_Contents"
+msgstr "_Съдържание"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
 msgstr "Започване на нов документ"
 
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "Нов"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "Сканиране на"
+
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
-msgstr "Спиране"
+msgid "Scan"
+msgstr "Сканиране"
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr "Запис на документа като файл"
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "Запазване"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
 msgid "Stop the current scan"
 msgstr "Спиране на текущото сканиране"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr "Текст"
-
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr "_Упълномощаване"
+msgid "Stop"
+msgstr "Спиране"
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
-msgstr "_Съдържание"
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Завъртане страницата на ляво (обратно на часовниковата стрелка)"
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr "И_зрязване"
+msgid "Rotate Left"
+msgstr "Завъртане наляво"
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr "_Потребителско"
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Завъртане страницата на дясно (по часовниковата стрелка)"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr "_Документ"
+msgid "Rotate Right"
+msgstr "Завъртане надясно"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "Отрязва избраната страница"
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
-msgstr "_Електронна поща"
+msgid "Crop"
+msgstr "Отрязване"
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr "_Помощ"
+msgid "_Username for resource:"
+msgstr "_Потребителско име за ресурса:"
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr "_Letter"
+msgid "_Password:"
+msgstr "_Парола:"
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr "_Нищо"
+msgid "_Authorize"
+msgstr "_Упълномощаване"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr "_Страница"
+msgid "Preferences"
+msgstr "Настройки"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr "_Парола:"
+msgid "Scan S_ource:"
+msgstr "Източник"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
-msgstr "_Разделителна способност на снимката:"
+msgid "_Text Resolution:"
+msgstr "_Разделителна способност на текста:"
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr "_Завъртане на изрязването"
+msgid "_Photo Resolution:"
+msgstr "_Разделителна способност на снимката:"
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
-msgstr "_Спиране на сканирането"
+msgid "Scan Side:"
+msgstr "Избор на страна за сканиране:"
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
-msgstr "_Разделителна способност на текста:"
+msgid "Page Size:"
+msgstr "Размер на листа:"
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
-msgstr "_Потребителско име за ресурса:"
+msgid "Brightness:"
+msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
-msgstr "Сканиране на документи"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
-msgstr "Устройство, от което да се сканира"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
-msgstr "Посока на сканиране"
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "Предна и обратна страна"
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
-msgstr "Папка, където да се запазят файловете"
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "Предна страна"
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
-msgstr "Височина на хартията в десетки милиметри"
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "Обратна страна"
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr "Височина на сканираното изображение в пиксели"
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "Сканиране на документи"
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
-msgstr "Страна на листа за сканиране"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "Ширина на прозореца в пиксели"
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
-msgstr "Разделителна способност на фото сканиранията"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "Височина на прозореца в пиксели"
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
-msgstr "Разделителна способност на текстовите сканирания"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "TRUE ако прозореца на приложението е максимизиран."
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
-msgstr "Разделителна способност на последното сканирано изображение"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "Устройство, от което да се сканира"
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
 msgstr "SANE устройство, от което да се получи изображението."
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
-msgstr "TRUE ако прозореца на приложението е максимизиран."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "Типове документи, които се сканират"
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
-"Посоката на скенера през сканираната страница. Може да бъде една от "
-"следните: 'отгоре-надолу' 'отдолу-нагоре' 'от лява-надясно' 'от дясно-наляво'"
+"Типът на сканирания документ. Тази настройка определя разделителната "
+"способност на сканиране, цветовете и последващата обработка."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "Посока на сканиране"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "Посоката на сканиране на страницата."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "Ширина на сканираните изображения в пиксели"
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
 msgstr ""
-"Папка, където да се запазват файловете. По подразбиране, ако не е настроено, "
-" е папката с документи."
+"Ширина на сканираните изображения в пиксели. Тази стойност е обновена до "
+"стойността от на последната сканирана страница."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "Височина на сканираното изображение в пиксели"
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
@@ -333,245 +355,249 @@ msgstr ""
 "Височина на сканираните изображения в пиксели. Тази стойност е обновена до "
 "височината на последната сканирана страница."
 
-#: ../data/simple-scan.schemas.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "Ширина на хартията в десетки милиметри"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Широчина на листа в десетки милиметри (избери 0 за автоматично разпознаване)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "Височина на хартията в десетки милиметри"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 "Височина на хартията в десетки милиметри (или 0 за автоматично разпознаване)."
 
-#: ../data/simple-scan.schemas.in.h:16
-msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
-"Страна на листа за сканиране. Тя може да бъде една от следните: \"двете\" "
-"\"предна\" \"обратна\""
 
-#: ../data/simple-scan.schemas.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "Разделителна способност на последното сканирано изображение"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
 msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr ""
 "Разделителна способност в точки-за-инч от предишното сканирано изображение."
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-"Разделителна способност в точки-за-инч, която да се използва при сканиране "
-"на снимки."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "Разделителна способност на текстовите сканирания"
 
-#: ../data/simple-scan.schemas.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 "Разделителна способност в точки-за-инч, която да се използва, когато се "
 "сканира текст."
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"Ширина на сканираните изображения в пиксели. Тази стойност е обновена до "
-"стойността от на последната сканирана страница."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "Разделителна способност на фото сканиранията"
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
-"Широчина на листа в десетки милиметри (избери 0 за автоматично разпознаване)."
+"Разделителна способност в точки-за-инч, която да се използва при сканиране "
+"на снимки."
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
-msgstr "Типове документи, които се сканират"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "Страна на листа за сканиране"
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
-msgstr ""
-"Типове документи, които се сканират. 'текст' за текстови документи, 'фото' "
-"за снимки. Тези настройки определят разделителната способност на "
-"сканирането, цветовете и последващата обработка."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "От коя страна на страницата да се сканира."
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
-msgstr "Ширина на хартията в десетки милиметри"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "Папка, където да се запазят файловете"
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
-msgstr "Ширина на сканираните изображения в пиксели"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Папка, където да се запазват файловете. По подразбиране, ако не е настроено, "
+" е папката с документи."
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
-msgstr "Височина на прозореца в пиксели"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
-msgstr "Ширина на прозореца в пиксели"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Не са налични скенери. Моля свържете скенер."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
 msgstr "Не може да се осъществи връзка със скенера"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
 msgstr "Сканирането не може да бъде стартирано"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
 msgstr "Грешка при комуникацията със скенера"
 
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Показване на версията"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Показване на съобщения за изчистване на грешки"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+"Поправяне на PDF файлове, създадени с по-стари версии на на Simple Scan"
+
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
 msgstr "Неуспех при сканиране"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
 msgstr "Сканиран документ"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
-msgstr ""
-"Употреба:\n"
-"  %s [УСТРОЙСТВО...] - Инструмент за сканиране"
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[DEVICE...] - Инструмент за сканиране"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
-#, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
-msgstr ""
-"Помощни опции:\n"
-"  -d, --debug Печатане на дебъг съобщения\n"
-"  -v, --version Показване на версията\n"
-"  -h, --help Показване на помощните опции\n"
-"  --help-all Показване всички помощни опции\n"
-"  --help-gtk Показване на GTK+ опции"
-
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
+msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
-"Опции на GTK+:\n"
-"  --class=КЛАС Класът на програмата, използван от мениджъра на прозорци\n"
-"  --name=ИМЕ Името на програмата, използвано от мениджъра на прозорци\n"
-"  --screen=ДИСПЛЕЙ Дисплеят на X, който да се ползва\n"
-"  --sync Извикванията на X да са синхронни\n"
-"  --gtk-module=МОДУЛИ Зареждане на допълнителни модули на GTK+\n"
-"  --g-fatal-warnings Всички предупреждения да се считат за грешки"
+"Изпълнете „%s --help“, за да видите списък с всички опции на командния ред."
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "Сканиран документ.pdf"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Необходими са потребителско име и парола за достъп до '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
 msgstr "Не са открити скенери"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
 msgstr "Моля проверете дали скенерът ви е свързан и включен"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr "PDF (документ с много страници)"
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr "JPEG (компресирани)"
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr "PNG (без загуби)"
-
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
 msgstr "Запазване като..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
 msgstr "Файлове с изображения"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
 msgstr "Всички файлове"
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
 msgstr "Избор на _тип файл"
 
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF (документ с много страници)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (компресирани)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (без загуби)"
+
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
 msgstr "Неуспех при запазване на файл"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Ако не запазите, промените ще бъдат изгубени."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
 msgstr "Запазване на текущия документ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
 msgstr "Отказ от промените"
 
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "Изображението не може да бъде запазено за предварителен преглед"
+
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
 msgstr "Невъзможно отварянето на приложение за преглед на изображението"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
 msgstr "Помощния файл не може да бъде отворен"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -602,78 +628,182 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
 msgstr "Относно Опростено сканиране"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
 msgstr "Инструмент за опростено сканиране на документи"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
+"  Boyan Sotirov https://launchpad.net/~lz1dsb\n"
 "  Krasimir Chonov https://launchpad.net/~kchonov\n"
+"  Miroslav E. Hadzhiev (Хаджиев) https://launchpad.net/~extigyro\n"
 "  Svetoslav Stefanov https://launchpad.net/~svetlisashkov\n"
+"  Tora Shiro https://launchpad.net/~tora-shiro\n"
 "  i.raynov https://launchpad.net/~ivaylo-raynov\n"
 "  Филип Андонов https://launchpad.net/~vonodna"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
 msgstr "Запис на документа преди излизане?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
 msgstr "Излизане без запазване"
 
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (по подразбиране)"
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#: ../src/ui.vala:1292
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (чернова)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
-#, c-format
-msgid "%d dpi"
-msgstr "%d dpi"
-
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (висока разделителна способност)"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
-msgstr "%d dpi (по подразбиране)"
+msgid "%d dpi"
+msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
 msgstr "Липсващи файлове"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
 msgstr "Моля проверете инсталацията си"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
 msgstr "Смяна на _скенер"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
-msgstr "Сканиран документ.pdf"
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr ""
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr ""
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr ""
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr ""
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr ""
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr ""
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "Запазване на документа..."
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "Запазване на страница %d от %d"
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "Употреба:\n"
+#~ "  %s [УСТРОЙСТВО...] - Инструмент за сканиране"
+
+#~ msgid ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ msgstr ""
+#~ "Посоката на скенера през сканираната страница. Може да бъде една от "
+#~ "следните: 'отгоре-надолу' 'отдолу-нагоре' 'от лява-надясно' 'от дясно-наляво'"
+
+#~ msgid ""
+#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ msgstr ""
+#~ "Страна на листа за сканиране. Тя може да бъде една от следните: \"двете\" "
+#~ "\"предна\" \"обратна\""
+
+#~ msgid ""
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
+#~ msgstr ""
+#~ "Типове документи, които се сканират. 'текст' за текстови документи, 'фото' "
+#~ "за снимки. Тези настройки определят разделителната способност на "
+#~ "сканирането, цветовете и последващата обработка."
+
+#, c-format
+#~ msgid ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+#~ msgstr ""
+#~ "Помощни опции:\n"
+#~ "  -d, --debug Печатане на дебъг съобщения\n"
+#~ "  -v, --version Показване на версията\n"
+#~ "  -h, --help Показване на помощните опции\n"
+#~ "  --help-all Показване всички помощни опции\n"
+#~ "  --help-gtk Показване на GTK+ опции"
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "Опции на GTK+:\n"
+#~ "  --class=КЛАС Класът на програмата, използван от мениджъра на прозорци\n"
+#~ "  --name=ИМЕ Името на програмата, използвано от мениджъра на прозорци\n"
+#~ "  --screen=ДИСПЛЕЙ Дисплеят на X, който да се ползва\n"
+#~ "  --sync Извикванията на X да са синхронни\n"
+#~ "  --gtk-module=МОДУЛИ Зареждане на допълнителни модули на GTK+\n"
+#~ "  --g-fatal-warnings Всички предупреждения да се считат за грешки"
diff --git a/po/bo.po b/po/bo.po
new file mode 100644
index 0000000..ca9664c
--- /dev/null
+++ b/po/bo.po
@@ -0,0 +1,778 @@
+# Tibetan translation for simple-scan
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the simple-scan package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: simple-scan\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-04-17 06:12+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"Language-Team: Tibetan <bo@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: 2013-09-13 05:46+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
+
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "པར་བཤུ་དཀྱུས་མ"
+
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: ../data/simple-scan.ui.h:4
+msgid "_Document"
+msgstr "ཡི་གེ_D"
+
+#. Scan menu item
+#: ../data/simple-scan.ui.h:6
+msgid "Sc_an"
+msgstr "པར་བཤུ_a"
+
+#. Toolbar scan menu item to scan a single page from the scanner
+#: ../data/simple-scan.ui.h:8
+msgid "Single _Page"
+msgstr "ཤོག་བུ་རྐང་ཅིག _P"
+
+#. Toolbar scan menu item to scan all pages from a document feeder
+#: ../data/simple-scan.ui.h:10
+msgid "All Pages From _Feeder"
+msgstr "སྤྲོད་མཁན་ནས་བྱུང་བའི་ཤོག་ལེབ་ཡོངས་རྫོགས _F"
+
+#. Menu entry to stop current scan
+#: ../data/simple-scan.ui.h:12
+msgid "_Stop Scan"
+msgstr "པར་ལེན་མཚམས་བཞག_S"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:14
+msgid "Text"
+msgstr "ཡི་གེ"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:16
+msgid "Photo"
+msgstr "པར"
+
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr "གློག་འཕྲིན_E"
+
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr "ཤོག་ལེབ_P"
+
+#. Menu item to rotate page to left (anti-clockwise)
+#: ../data/simple-scan.ui.h:22
+msgid "Rotate _Left"
+msgstr "གཡོན་སྐོར _L"
+
+#. Menu item to rotate page to right (clockwise)
+#: ../data/simple-scan.ui.h:24
+msgid "Rotate _Right"
+msgstr "གཡས་སྐོར་ _R"
+
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "གཅོད_C"
+
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "ཅི་མེད་པ_N"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "འཕྲིན་ཡིག_L"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "ཁྲིམས་མཐུན_g"
+
+#. Radio button for cropping page to 4x6 inch
+#: ../data/simple-scan.ui.h:40
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
+
+#. Radio button for cropping to custom page size
+#: ../data/simple-scan.ui.h:42
+msgid "_Custom"
+msgstr "སྲོལ་རྒྱུན_C"
+
+#. Menu item to rotate the crop area
+#: ../data/simple-scan.ui.h:44
+msgid "_Rotate Crop"
+msgstr "དྲས་གཅོད་སྐོར་བ_R"
+
+#. Menu item to move the selected page to the left
+#: ../data/simple-scan.ui.h:46
+msgid "Move Left"
+msgstr "གཡོན་ལ་སྤོར"
+
+#. Menu item to move the selected page to the right
+#: ../data/simple-scan.ui.h:48
+msgid "Move Right"
+msgstr "གཡས་ལ་སྤོར"
+
+#. Label on help menu
+#: ../data/simple-scan.ui.h:50
+msgid "_Help"
+msgstr "རོགས་རམ_H"
+
+#. Help|Contents menu
+#: ../data/simple-scan.ui.h:52
+msgid "_Contents"
+msgstr "ནང་གསེས_C"
+
+#. Tooltip for new document button
+#: ../data/simple-scan.ui.h:54
+msgid "Start a new document"
+msgstr "ཡིག་གེ་གསར་འཛུགས"
+
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "གསར་པ"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "པར་བཤུ་ཆས་ནས་བྱུང་བའི་ཤོག་བུ་རྐང་ཅིག་དེ་པར་བཤུ"
+
+#. Label on scan toolbar item
+#: ../data/simple-scan.ui.h:59
+msgid "Scan"
+msgstr "པར་བཤུ"
+
+#. Tooltip for save toolbar button
+#: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr "ཡི་གེ་ཡིག་ཆའི་ནང་གསོག་ཉར"
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "གསོག་ཉར"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
+msgid "Stop the current scan"
+msgstr "པར་བཤུ་བྱེད་བཞིན་པ་དེ་མཚམས་བཞག"
+
+#: ../data/simple-scan.ui.h:65
+msgid "Stop"
+msgstr "མཚམས་བཞག"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: ../data/simple-scan.ui.h:67
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "ཤོག་ལེབ་གཡོན་སྐོར་རྒྱག་པ"
+
+#. Label on rotate page left (anti-clockwise) item
+#: ../data/simple-scan.ui.h:69
+msgid "Rotate Left"
+msgstr "གཡོན་སྐོར"
+
+#. Tooltip for rotate right (clockwise) button
+#: ../data/simple-scan.ui.h:71
+msgid "Rotate the page to the right (clockwise)"
+msgstr "ཤོག་ལེབ་གཡས་སྐོར་རྒྱག་པ"
+
+#. Label on rotate page right (clockwise) item
+#: ../data/simple-scan.ui.h:73
+msgid "Rotate Right"
+msgstr "གཡས་སྐོར"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "བདམས་ཟིན་པའི་ཤོག་ལེབ་གཅད་བཟོ"
+
+#: ../data/simple-scan.ui.h:75
+msgid "Crop"
+msgstr "གཅད"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:77
+msgid "_Username for resource:"
+msgstr "གཏེར་མཛོད་སྤྱོད་མཁན་གྱི་མིང་_U:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:79
+msgid "_Password:"
+msgstr "གསང་གྲངས_P:"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:81
+msgid "_Authorize"
+msgstr "ཐོབ་ཐང་སྟེར_A"
+
+#. Title of preferences dialog
+#: ../data/simple-scan.ui.h:83
+msgid "Preferences"
+msgstr "རང་མོས་སྒྲིག་བཟོ"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:85
+msgid "Scan S_ource:"
+msgstr "པར་བཤུ་གཏེར་མཛོད_o:"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:87
+msgid "_Text Resolution:"
+msgstr "ཡི་གེའི་སྤུས་ཚད_T"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:89
+msgid "_Photo Resolution:"
+msgstr "པར་གྱི་སྤྭུས་ཚད"
+
+#. Label beside scan side combo box
+#: ../data/simple-scan.ui.h:91
+msgid "Scan Side:"
+msgstr "ཟུར་པར་བཤུ"
+
+#. Label beside page size combo box
+#: ../data/simple-scan.ui.h:93
+msgid "Page Size:"
+msgstr "ཤོག་ལེབ་ཞེང་ཚད"
+
+#. Label beside brightness scale
+#: ../data/simple-scan.ui.h:95
+msgid "Brightness:"
+msgstr ""
+
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr ""
+
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr ""
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "རྒྱབ་ཕྱོགས་དང་མདུན་ཕྱོགས"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "མདུན་ཕྱོགས"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "རྒྱབ་ཕྱོགས"
+
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "ཡིག་གེ་པར་བཤུ"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "Window width in pixels"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "Window height in pixels"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "གལ་སྲིད་ཉེར་སྤྱོད་སྒེའུ་ཁུང་རྒྱ་བསྐྱེད་ཚར་ན་TRUEའམ་་བདེན་པར་འཛུགས"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "འབྱུང་ཁུངས་མི་འདྲ་བའི་པར་བཤུ་སྒྲིག་ཆས"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+msgid "SANE device to acquire images from."
+msgstr "པར་རིས་འདོནསའི་SANE་སྒྲིག་ཆས་"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "པར་བཤུ་ཡིག་ཆའི་རིགས"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "པར་བཤུ་ཁ་ཕྱོགས"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "Width of scanned image in pixels"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
+msgid ""
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
+msgstr ""
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "པར་བཤུ་བྱས་ཟིན་པའི་གཟུགས་བརྙན་མཐོ་ཚད་ཀྱི་ཚོན་གྲངས"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
+msgid ""
+"The height of scanned image in pixels. This value is updated to what the "
+"last scanned page was."
+msgstr ""
+"ཐེངས་རྗེས་མའི་པར་བཤུའི་པར་རིས་མཐོ་ཚད་ཀྱི་ཚོན་གྲངས། ཐོབ་གྲངས་འདི་ "
+"ཐེངས་རྗེས་མའི་པར་བཤུ་འདྲ་པར་གསར་བསྒྱུར་བྱས་ཟིན"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "ཤོག་ལེབ་ཀྱི་མཐོ་ཚད་བཅུ་ཆའི་རྨིད་སྟོང་ཆ་ཚོད་"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "ཐེངས་རྗེས་མར་པར་བཤུའི་གཟུགས་བརྙན་གྱི་སྤུས་ཚད"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
+msgid "The resolution in dots-per-inch of the previously scanned image."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "ཡི་གེའི་པར་བཤུའི་སྤུས་ཚད"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "པར་བཤུའི་སྤུས་ཚད"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "པར་བཤུ་དགོས་པའི་ཤོག་ཟུར"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "ཡིག་ཆ་གསོག་སྣོད"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"ཡིག་ཆ་གསོག་སའི་གནས། "
+"གལ་སྲིད་རང་མོས་སྒྲིག་འཛུགས་མེད་ན་སྔོན་འཛུགས་འཇུག་སྣོད་བེད་སྤྱོད"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr ""
+
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:814
+msgid "No scanners available.  Please connect a scanner."
+msgstr "པར་བཤུ་ཆས་བསྒྲིགས་མི་འདུག པར་བཤུ་ཆས་ཞིག་སྒྲིགས་རོགས"
+
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:844
+msgid "Unable to connect to scanner"
+msgstr "པར་བཤུ་ཆས་དང་སྦྲེལ་མ་ཐུབ"
+
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1207
+msgid "Unable to start scan"
+msgstr "པར་བཤུ་འགོ་འཛུགས་མ་ཐུབ"
+
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+msgid "Error communicating with scanner"
+msgstr "པར་བཤུ་ཆས་དང་འབྲེལ་གཏུགས་མ་ཐུབ་པའི་ནོར་འཁྲུལ"
+
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr ""
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr ""
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:297
+msgid "Failed to scan"
+msgstr "པར་བཤུ་བྱེད་མ་ཐུབ་པ"
+
+#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
+#: ../src/simple-scan.vala:316
+msgid "Scanned Document"
+msgstr "པར་བཤུ་ཚར་བའི་ཡི་གེ"
+
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr ""
+
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
+#, c-format
+msgid "Run '%s --help' to see a full list of available command line options."
+msgstr ""
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "པར་བཤུས་ཡིག་ཆ.pdf"
+
+#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
+#: ../src/ui.vala:159
+#, c-format
+msgid "Username and password required to access '%s'"
+msgstr "'%s'མཁོ་སྤྱོད་བྱེད་པར་སྤྱོད་མཁན་མིང་དང་གསང་གྲངས་དགོས་པ"
+
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:202
+msgid "No scanners detected"
+msgstr "པར་བཤུ་ཆས་རྙེད་མ་བྱུང་"
+
+#. Hint to user on why there are no scanners detected
+#: ../src/ui.vala:204
+msgid "Please check your scanner is connected and powered on"
+msgstr "ཁྱོད་ཀྱི་པར་བཤུ་ཆས་སྦྲེལ་ཡོད་པ་དང་གློག་བཏང་ཡོད་པར་དག་བཤེར་བྱེད་རོགས"
+
+#. Save dialog: Dialog title
+#: ../src/ui.vala:363
+msgid "Save As..."
+msgstr "ཉར་སྟངས་་་"
+
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:377
+msgid "Image Files"
+msgstr "གཟུགས་བརྙན་ཡིག་ཆ"
+
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:383
+msgid "All Files"
+msgstr "ཡིག་ཆ་ཡོངས་རྫོགས"
+
+#. 
+#: ../src/ui.vala:388
+msgid "Select File _Type"
+msgstr "ཡིག་ཆའི་རིགས་གདམ་པ_T"
+
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF(ཤོག་ལེབ་མང་པོའི་ཡིག་ཆ)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (བསྡུ་འཇུག)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (བོར་བརླག་མ་ཤོར་བ)"
+
+#. Title of error dialog when save failed
+#: ../src/ui.vala:503
+msgid "Failed to save file"
+msgstr "ཡིག་ཆ་གསོག་འཇོག་བྱེད་མ་ཐུབ"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:526
+msgid "If you don't save, changes will be permanently lost."
+msgstr "ཁྱོད་ཀྱིས་གསོག་འཇོག་མ་བྱས་ན་བཟོ་བཅོས་རྣམས་ནམ་ཡང་བརླགས་འགྲོ་ངེས"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:563
+msgid "Save current document?"
+msgstr "དང་ཐོག་གི་ཡིག་ཆ་ཉར་ཚགས"
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:565
+msgid "Discard Changes"
+msgstr "བཟོ་བཅོས་རྣམས་འདོར་བ"
+
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.vala:872
+msgid "Unable to open image preview application"
+msgstr "སྔོན་ལྟ་ཉེར་སྤྱོད་ཁ་ཕྱེ་མ་ཐུབ་པ"
+
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1119
+msgid "Unable to open help file"
+msgstr "རོགས་འདེགས་ཡིག་ཆ་ཁ་ཕྱེ་མ་ཐུབ"
+
+#. The license this software is under (GPL3+)
+#: ../src/ui.vala:1130
+msgid ""
+"This program is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 3 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program.  If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+"This program is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 3 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program.  If not, see <http://www.gnu.org/licenses/>."
+
+#. Title of about dialog
+#: ../src/ui.vala:1133
+msgid "About Simple Scan"
+msgstr "པར་བཤུ་བ་དཀྱུས་མའི་སྐོར"
+
+#. Description of program
+#: ../src/ui.vala:1136
+msgid "Simple document scanning tool"
+msgstr "ཡིག་ཆ་པར་བཤུ་ཆས་དཀྱུས་མ"
+
+#: ../src/ui.vala:1145
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Tennom https://launchpad.net/~tennomyathog"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1156
+msgid "Save document before quitting?"
+msgstr "ཕྱིར་འཐེན་མ་བྱས་གོང་གསོག་འཇོག་བྱེད་པ"
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1158
+msgid "Quit without Saving"
+msgstr "གསོག་འཇོག་མ་བྱས་པར་ཕྱིར་འཐེན"
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (སྔོན་འཛུགས)"
+
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1292
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d dpi (ཟིན་བྲིས)"
+
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1295
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d dpi (སྤུས་ཚད་མཐོན་པོ)"
+
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
+#, c-format
+msgid "%d dpi"
+msgstr ""
+
+#. Title of dialog when cannot load required files
+#: ../src/ui.vala:1333
+msgid "Files missing"
+msgstr "ཡིག་ཆ་བརླགས་ཚར་འདུག"
+
+#. Description in dialog when cannot load required files
+#: ../src/ui.vala:1335
+msgid "Please check your installation"
+msgstr "ཁྱོད་ཀྱི་སྒྲིག་འཇུག་ཞིབ་བཤེར་གནང་རོགས"
+
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1403
+msgid "Change _Scanner"
+msgstr "པར་བཤུ་ཆས་བརྗེ་བ_S"
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1409
+msgid "Automatic"
+msgstr "ར་ང་འགུལ་ངང"
+
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr ""
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr ""
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr ""
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr ""
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr ""
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr ""
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr ""
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr ""
+
+#~ msgid ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ msgstr ""
+#~ "པར་བཤུ་ཆས་ཀྱི་ཁ་ཕྱོགས་ནི་ཤོག་ལེབ་ཡོངས་ཁྱབ་ཡིན་པ་དང་གཤམ་གྱི་འདེམས་ཀ་བཞི་སྟེ། "
+#~ "'གོང་ནས་འོག' 'འོག་ནས་གོང' 'གཡོན་ནས་གཡས' 'གཡས་ནས་གཡོན'"
+
+#~ msgid ""
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
+#~ msgstr ""
+#~ "པར་བཤུ་ཡིག་ཆའི་རིགས། 'ཡི་གེ'ནི་ཡིག་གེ་ཡིག་ཆ་ཡིན་པ། 'པར'ནི་ "
+#~ "པར་རིས་ཡིག་ཆ་ཡིན་པ། སྒྲིག་འཛུགས་འདིའི་པར་བཤུའི་སྤུས་ཚད། "
+#~ "ཚོན་མདོག་དང་འཇུག་མཐའི་འགུལ་སྐྱོད་ཐག་གཅོད་བྱེད"
+
+#, c-format
+#~ msgid ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+#~ msgstr ""
+#~ "རོགས་རམ་འདེམས་ཐོ:\n"
+#~ "  -d, --སྐྱོན་གསོ          སྐྱོན་གསོ་ཡི་གེ་པར་རྒྱག་པ\n"
+#~ "  -v, --པར་གཞི          པར་གཞི་གསར་པ་མངོན་པ\n"
+#~ "  -h, -རོགས་རམ         རོགས་རམ་འདེམས་ཐོ་མངོན་པ\n"
+#~ "  --རོགས་རམ་ཡོངས་རྫོགས  རོགས་རམ་འདེམས་ཐོ་ཡོངས་རྫོགས་མངོན་པ\n"
+#~ "  --gtkརོགས་འདེགས      GTK+ འདེམས་ཐོ་མངོན་པ"
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "GTK+ འདེམས་ཐོ:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
diff --git a/po/ca.po b/po/ca.po
index 79e5855..526c9f0 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,327 +7,347 @@ msgid ""
 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-05 10:33+0000\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-07-23 08:57+0000\n"
 "Last-Translator: David Planella <david.planella@ubuntu.com>\n"
 "Language-Team: Catalan <ca@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-10-22 04:47+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:44+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Escaneig senzill"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr "A_4"
+msgid "_Document"
+msgstr "_Document"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr "Esc_aneja"
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "Pàgina _individual"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:10
 msgid "All Pages From _Feeder"
 msgstr "Totes les pàgines de l'a_limentador"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr "Dorsal"
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
-msgstr "Escapça"
+msgid "_Stop Scan"
+msgstr "_Atura l'escaneig"
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr "Escapça la pàgina seleccionada"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr "Frontal"
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr "Per dues cares"
-
-#. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr "Le_gal EUA"
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr "Nou"
-
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr "Mida de la pàgina:"
+msgid "Text"
+msgstr "Text"
 
 #. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
+#: ../data/simple-scan.ui.h:16
 msgid "Photo"
 msgstr "Foto"
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr "Preferències"
-
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
-msgstr "Gira a l'esquerra"
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr "_Envia per correu"
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr "Gira a la dreta"
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr "_Pàgina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
+#: ../data/simple-scan.ui.h:22
 msgid "Rotate _Left"
 msgstr "Gira a l'_esquerra"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
+#: ../data/simple-scan.ui.h:24
 msgid "Rotate _Right"
 msgstr "Gira a la _dreta"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Gireu la pàgina cap a l'esquerra (en sentit antihorari)"
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "_Escapçament"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Gireu la pàgina cap a la dreta (en sentit horari)"
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "_Cap"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "_Carta EUA"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "Le_gal EUA"
 
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr "Desa"
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr "Desa el document en un fitxer"
+msgid "_Custom"
+msgstr "_Personalitzat"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr "Esc_aneja"
+msgid "_Rotate Crop"
+msgstr "_Gira l'escapçament"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
-msgstr "Escaneja"
+msgid "Move Left"
+msgstr ""
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr "Font d'_escaneig:"
+msgid "Move Right"
+msgstr ""
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr "Cara a escanejar:"
+msgid "_Help"
+msgstr "A_juda"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
-msgstr "Escaneja una sola pàgina de l'escàner"
-
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr "Escaneig senzill"
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr "Pàgina _individual"
+msgid "_Contents"
+msgstr "C_ontingut"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
 msgstr "Comença un document nou"
 
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "Nou"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "Escaneja una sola pàgina de l'escàner"
+
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
-msgstr "Atura"
+msgid "Scan"
+msgstr "Escaneja"
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr "Desa el document en un fitxer"
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "Desa"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
 msgid "Stop the current scan"
 msgstr "Atura l'escaneig actual"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr "Text"
-
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr "_Autoritza"
+msgid "Stop"
+msgstr "Atura"
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
-msgstr "C_ontingut"
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Gireu la pàgina cap a l'esquerra (en sentit antihorari)"
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr "_Escapçament"
+msgid "Rotate Left"
+msgstr "Gira a l'esquerra"
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr "_Personalitzat"
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Gireu la pàgina cap a la dreta (en sentit horari)"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr "_Document"
+msgid "Rotate Right"
+msgstr "Gira a la dreta"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "Escapça la pàgina seleccionada"
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
-msgstr "_Envia per correu"
+msgid "Crop"
+msgstr "Escapça"
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr "A_juda"
+msgid "_Username for resource:"
+msgstr "_Nom d'usuari del recurs:"
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr "_Carta EUA"
+msgid "_Password:"
+msgstr "_Contrasenya:"
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr "_Cap"
+msgid "_Authorize"
+msgstr "_Autoritza"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr "_Pàgina"
+msgid "Preferences"
+msgstr "Preferències"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr "_Contrasenya:"
+msgid "Scan S_ource:"
+msgstr "Font d'_escaneig:"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
-msgstr "_Resolució fotogràfica:"
+msgid "_Text Resolution:"
+msgstr "_Resolució de text:"
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr "_Gira l'escapçament"
+msgid "_Photo Resolution:"
+msgstr "_Resolució fotogràfica:"
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
-msgstr "_Atura l'escaneig"
+msgid "Scan Side:"
+msgstr "Cara a escanejar:"
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
-msgstr "_Resolució de text:"
+msgid "Page Size:"
+msgstr "Mida de la pàgina:"
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
-msgstr "_Nom d'usuari del recurs:"
+msgid "Brightness:"
+msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
-msgstr "Escanegeu documents"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
-msgstr "Dispositiu d'escaneig"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
-msgstr "Direcció de l'escaneig"
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "Ambdues cares"
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
-msgstr "Directori on desar els fitxers"
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "Anvers de la pàgina"
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
-msgstr "Alçada del paper en dècimes parts d'un mm"
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "Revers de la pàgina"
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr "Alçada de la imatge escanejada en píxels"
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "Escanegeu documents"
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
-msgstr "Cara de la pàgina a escanejar"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "Amplada de la finestra en píxels"
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
-msgstr "Resolució per l'escaneig de fotos"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "Alçada de la finestra en píxels"
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
-msgstr "Resolució per l'escaneig de text"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "TRUE (cert) si la finestra de l'aplicació està maximitzada"
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
-msgstr "Resolució de l'última imatge escanejada"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "Dispositiu d'escaneig"
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
 msgstr "Dispositiu SANE per a l'adquisició d'imatges."
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
-msgstr "TRUE (cert) si la finestra de l'aplicació està maximitzada"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "Tipus de document a escanejar"
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
-"La direcció de l'escaneig a través de la pàgina escanejada. Pot ser una de "
-"les següents: «top-to-bottom» (de dalt a baix), «bottom-to-top» (de baix a "
-"dalt), «left-to-right» (d'esquerra a dreta) o «right-to-left» (de dreta a "
-"esquerra)."
+"El tipus de document que s'està escanejant. Aquest paràmetre decideix la "
+"resolució d'escaneig, els colors i el processament posterior."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "Direcció de l'escaneig"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "La direcció de l'escànner a través de la pàgina escanejada."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "Amplada de la imatge escanejada en píxels"
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
 msgstr ""
-"El directori on desar els fitxers. Per defecte serà el directori de "
-"documents si no es defineix."
+"L'amplada de la imatge escanejada en píxels. Aquest valor s'ha actualitzat "
+"al que tenia l'última pàgina escanejada."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "Alçada de la imatge escanejada en píxels"
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
@@ -335,7 +355,23 @@ msgstr ""
 "L'alçada de la imatge escanejada en píxels. Aquest valor s'ha actualitzat al "
 "que tenia l'última pàgina escanejada."
 
-#: ../data/simple-scan.schemas.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "Amplada del paper en dècimes de mm"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"L'amplada del paper en dècimes de mm (o 0 per la detecció automàtica del "
+"paper)"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "Alçada del paper en dècimes parts d'un mm"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -343,237 +379,224 @@ msgstr ""
 "L'alçada del paper en dècimes de mm (o 0 per la detecció automàtica del "
 "paper)."
 
-#: ../data/simple-scan.schemas.in.h:16
-msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
-"El costat de la pàgina a escanejar. Pot ser un dels següents: «both» "
-"(ambdós), «front» (frontal) o «back» (dorsal)"
 
-#: ../data/simple-scan.schemas.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "Resolució de l'última imatge escanejada"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
 msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr ""
 "La resolució en punts per polzada de la imatge prèviament escanejada."
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "La resolució en punts per polzada quan s'escanegin fotos."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "Resolució per l'escaneig de text"
 
-#: ../data/simple-scan.schemas.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "La resolució en punts per polzada quan s'escanegi text."
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"L'amplada de la imatge escanejada en píxels. Aquest valor s'ha actualitzat "
-"al que tenia l'última pàgina escanejada."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "Resolució per l'escaneig de fotos"
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"L'amplada del paper en dècimes de mm (o 0 per la detecció automàtica del "
-"paper)"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "La resolució en punts per polzada quan s'escanegin fotos."
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
-msgstr "Tipus de document a escanejar"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "Cara de la pàgina a escanejar"
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
-msgstr ""
-"Tipus de document a escanejar. «text» per documents de text o «photo» per "
-"fotos. Aquest paràmetre decideix la resolució de l'escaneig, els colors i el "
-"postprocessament."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "La cara de la pàgina a escanejar."
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
-msgstr "Amplada del paper en dècimes de mm"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "Directori on desar els fitxers"
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
-msgstr "Amplada de la imatge escanejada en píxels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"El directori on desar els fitxers. Per defecte serà el directori de "
+"documents si no es defineix."
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
-msgstr "Alçada de la finestra en píxels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
-msgstr "Amplada de la finestra en píxels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
 msgstr "No hi ha cap escàner disponible. Si us plau, connecteu-ne un."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
 msgstr "No s'ha pogut connectar a l'escàner"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
 msgstr "No s'ha pogut iniciar l'escaneig"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
 msgstr "S'ha produït un error en comunicar-se amb l'escàner"
 
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Mostra la versió de llançament"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Mostra els missatges de depuració"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+"Arregla els fitxers PDF generats amb versions anteriors de l'Escaneig senzill"
+
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
 msgstr "Ha fallat l'escaneig"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
 msgstr "Document escanejat"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
-msgstr ""
-"Forma d'ús:\n"
-"  %s [DISPOSITIU...] - Utilitat d'escaneig"
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[DISPOSITIU...] - Utilitat d'escaneig"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
-#, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
-msgstr ""
-"Ajuda per a les opcions:\n"
-"  -d, --debug                     Mostra els missatges de depuració\n"
-"  -v, --version                   Mostra la versió del programa\n"
-"  -h, --help                      Mostra l'ajuda de les opcions\n"
-"  --help-all                      Mostra l'ajuda de totes les opcions\n"
-"  --help-gtk                      Mostra l'ajuda de les opcions de la GTK+"
-
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
+msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
-"Opcions de la GTK+:\n"
-"  --class=CLASSE                  Classe del programa tal com l'utilitza el "
-"gestor de finestres\n"
-"  --name=NOM                      Nom del programa tal com l'utilitza el "
-"gestor de finestres\n"
-"  --screen=PANTALLA               Pantalla X a utilitzar\n"
-"  --sync                          Fa que les crides X siguin síncrones\n"
-"  --gtk-module=MÒDULS             Carrega mòduls de la GTK+ addicionals\n"
-"  --g-fatal-warnings              Fa que tots els avisos siguin fatals"
+"Executeu «%s --help» per veure la llista completa d'opcions disponibles de "
+"la línia d'ordres."
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "Document escanejat.pdf"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Cal un usuari i contrasenya per a accedir a «%s»"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
 msgstr "No s'ha detectat cap escàner"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
 msgstr "Comproveu que l'escàner està connectat i engegat"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr "PDF (document multipàgina)."
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr "JPEG (comprimit)"
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr "PNG (sense pèrdua)"
-
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
 msgstr "Anomena i desa..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
 msgstr "Fitxers d'imatge"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
 msgstr "Tots els fitxers"
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
 msgstr "Seleccioneu el _tipus de fitxer"
 
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF (document multipàgina)."
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (comprimit)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (sense pèrdua)"
+
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
-msgstr "Ha fallat el desament del fitxer"
+msgstr "No s'ha pogut desar el fitxer"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Si no ho deseu, els canvis es perdran per sempre més."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
 msgstr "Voleu desar el document actual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
 msgstr "Descarta els canvis"
 
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "No s'ha pogut desar la imatge per previsualitzar-la"
+
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
 msgstr "No s'ha pogut obrir l'aplicació de previsualització d'imatges"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
 msgstr "No s'ha pogut obrir el fitxer d'ajuda"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -605,79 +628,187 @@ msgstr ""
 "juntament amb aquest programa. Si no, mireu <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
 msgstr "Quant a l'escaneig senzill"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
 msgstr "Eina senzilla d'escaneig de documents"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  David Planella https://launchpad.net/~dpm\n"
+"  J. https://launchpad.net/~jose-manuel-rodriguez-moreno\n"
+"  J. Gregpori Raya https://launchpad.net/~gregori\n"
 "  Joan Duran https://launchpad.net/~jodufi\n"
 "  Sergi https://launchpad.net/~scaparrosj\n"
 "  Siegfried Gevatter https://launchpad.net/~rainct\n"
+"  SiscoGarcia https://launchpad.net/~sisco\n"
 "  pancake https://launchpad.net/~pancake"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
 msgstr "Voleu desar el document abans de sortir?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
 msgstr "Surt sense desar"
 
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d ppp (predeterminat)"
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#: ../src/ui.vala:1292
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (esborrany)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
-#, c-format
-msgid "%d dpi"
-msgstr "%d ppp"
-
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d ppp (alta resolució)"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
-msgstr "%d ppp (predeterminat)"
+msgid "%d dpi"
+msgstr "%d ppp"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
 msgstr "Manquen fitxers"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
 msgstr "Comproveu la vostra instal·lació"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
 msgstr "Canvia l'e_scàner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
 msgstr "Automàtic"
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
-msgstr "Document escanejat.pdf"
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr ""
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr ""
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr ""
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr ""
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr ""
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr ""
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "S'està desant el document..."
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "S'està desant la pàgina %d de %d"
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "Forma d'ús:\n"
+#~ "  %s [DISPOSITIU...] - Utilitat d'escaneig"
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "Opcions de la GTK+:\n"
+#~ "  --class=CLASSE                  Classe del programa tal com l'utilitza el "
+#~ "gestor de finestres\n"
+#~ "  --name=NOM                      Nom del programa tal com l'utilitza el "
+#~ "gestor de finestres\n"
+#~ "  --screen=PANTALLA               Pantalla X a utilitzar\n"
+#~ "  --sync                          Fa que les crides X siguin síncrones\n"
+#~ "  --gtk-module=MÒDULS             Carrega mòduls de la GTK+ addicionals\n"
+#~ "  --g-fatal-warnings              Fa que tots els avisos siguin fatals"
+
+#~ msgid ""
+#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ msgstr ""
+#~ "El costat de la pàgina a escanejar. Pot ser un dels següents: «both» "
+#~ "(ambdós), «front» (frontal) o «back» (dorsal)"
+
+#~ msgid ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ msgstr ""
+#~ "La direcció de l'escaneig a través de la pàgina escanejada. Pot ser una de "
+#~ "les següents: «top-to-bottom» (de dalt a baix), «bottom-to-top» (de baix a "
+#~ "dalt), «left-to-right» (d'esquerra a dreta) o «right-to-left» (de dreta a "
+#~ "esquerra)."
+
+#~ msgid ""
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
+#~ msgstr ""
+#~ "Tipus de document a escanejar. «text» per documents de text o «photo» per "
+#~ "fotos. Aquest paràmetre decideix la resolució de l'escaneig, els colors i el "
+#~ "postprocessament."
+
+#, c-format
+#~ msgid ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+#~ msgstr ""
+#~ "Ajuda per a les opcions:\n"
+#~ "  -d, --debug                     Mostra els missatges de depuració\n"
+#~ "  -v, --version                   Mostra la versió del programa\n"
+#~ "  -h, --help                      Mostra l'ajuda de les opcions\n"
+#~ "  --help-all                      Mostra l'ajuda de totes les opcions\n"
+#~ "  --help-gtk                      Mostra l'ajuda de les opcions de la GTK+"
diff --git a/po/ca@valencia.po b/po/ca@valencia.po
new file mode 100644
index 0000000..c424460
--- /dev/null
+++ b/po/ca@valencia.po
@@ -0,0 +1,808 @@
+# Catalan (Valencian) translation for simple-scan
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the simple-scan package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: simple-scan\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-04-17 06:12+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"Language-Team: Catalan (Valencian) <ca@valencia@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: 2013-09-13 05:46+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
+
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Escaneig senzill"
+
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: ../data/simple-scan.ui.h:4
+msgid "_Document"
+msgstr "_Document"
+
+#. Scan menu item
+#: ../data/simple-scan.ui.h:6
+msgid "Sc_an"
+msgstr "Esc_aneja"
+
+#. Toolbar scan menu item to scan a single page from the scanner
+#: ../data/simple-scan.ui.h:8
+msgid "Single _Page"
+msgstr "Pàgina _individual"
+
+#. Toolbar scan menu item to scan all pages from a document feeder
+#: ../data/simple-scan.ui.h:10
+msgid "All Pages From _Feeder"
+msgstr "Totes les pàgines de l'a_limentador"
+
+#. Menu entry to stop current scan
+#: ../data/simple-scan.ui.h:12
+msgid "_Stop Scan"
+msgstr "_Atura l'escaneig"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:14
+msgid "Text"
+msgstr "Text"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:16
+msgid "Photo"
+msgstr "Foto"
+
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr "_Envia per correu"
+
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr "_Pàgina"
+
+#. Menu item to rotate page to left (anti-clockwise)
+#: ../data/simple-scan.ui.h:22
+msgid "Rotate _Left"
+msgstr "Gira a l'_esquerra"
+
+#. Menu item to rotate page to right (clockwise)
+#: ../data/simple-scan.ui.h:24
+msgid "Rotate _Right"
+msgstr "Gira a la _dreta"
+
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "_Escapçament"
+
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "_Cap"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "_Carta EUA"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "Le_gal EUA"
+
+#. Radio button for cropping page to 4x6 inch
+#: ../data/simple-scan.ui.h:40
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
+
+#. Radio button for cropping to custom page size
+#: ../data/simple-scan.ui.h:42
+msgid "_Custom"
+msgstr "_Personalitzat"
+
+#. Menu item to rotate the crop area
+#: ../data/simple-scan.ui.h:44
+msgid "_Rotate Crop"
+msgstr "_Gira l'escapçament"
+
+#. Menu item to move the selected page to the left
+#: ../data/simple-scan.ui.h:46
+msgid "Move Left"
+msgstr "Mou a l'esquerra"
+
+#. Menu item to move the selected page to the right
+#: ../data/simple-scan.ui.h:48
+msgid "Move Right"
+msgstr "Mou a la dreta"
+
+#. Label on help menu
+#: ../data/simple-scan.ui.h:50
+msgid "_Help"
+msgstr "A_juda"
+
+#. Help|Contents menu
+#: ../data/simple-scan.ui.h:52
+msgid "_Contents"
+msgstr "C_ontingut"
+
+#. Tooltip for new document button
+#: ../data/simple-scan.ui.h:54
+msgid "Start a new document"
+msgstr "Comença un document nou"
+
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "Nou"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "Escaneja una sola pàgina de l'escàner"
+
+#. Label on scan toolbar item
+#: ../data/simple-scan.ui.h:59
+msgid "Scan"
+msgstr "Escaneja"
+
+#. Tooltip for save toolbar button
+#: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr "Alça el document en un fitxer"
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "Alça"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
+msgid "Stop the current scan"
+msgstr "Para l'escaneig actual"
+
+#: ../data/simple-scan.ui.h:65
+msgid "Stop"
+msgstr "Para"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: ../data/simple-scan.ui.h:67
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Gireu la pàgina cap a l'esquerra (en sentit antihorari)"
+
+#. Label on rotate page left (anti-clockwise) item
+#: ../data/simple-scan.ui.h:69
+msgid "Rotate Left"
+msgstr "Gira a l'esquerra"
+
+#. Tooltip for rotate right (clockwise) button
+#: ../data/simple-scan.ui.h:71
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Gireu la pàgina cap a la dreta (en sentit horari)"
+
+#. Label on rotate page right (clockwise) item
+#: ../data/simple-scan.ui.h:73
+msgid "Rotate Right"
+msgstr "Gira a la dreta"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "Escapça la pàgina seleccionada"
+
+#: ../data/simple-scan.ui.h:75
+msgid "Crop"
+msgstr "Escapça"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:77
+msgid "_Username for resource:"
+msgstr "_Nom d'usuari del recurs:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:79
+msgid "_Password:"
+msgstr "_Contrasenya:"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:81
+msgid "_Authorize"
+msgstr "_Autoritza"
+
+#. Title of preferences dialog
+#: ../data/simple-scan.ui.h:83
+msgid "Preferences"
+msgstr "Preferències"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:85
+msgid "Scan S_ource:"
+msgstr "Font d'_escaneig:"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:87
+msgid "_Text Resolution:"
+msgstr "_Resolució de text:"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:89
+msgid "_Photo Resolution:"
+msgstr "_Resolució fotogràfica:"
+
+#. Label beside scan side combo box
+#: ../data/simple-scan.ui.h:91
+msgid "Scan Side:"
+msgstr "Cara a escanejar:"
+
+#. Label beside page size combo box
+#: ../data/simple-scan.ui.h:93
+msgid "Page Size:"
+msgstr "Mida de la pàgina:"
+
+#. Label beside brightness scale
+#: ../data/simple-scan.ui.h:95
+msgid "Brightness:"
+msgstr ""
+
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr ""
+
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr ""
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "Ambdues cares"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "Anvers de la pàgina"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "Revers de la pàgina"
+
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "Escanegeu documents"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "Amplada de la finestra en píxels"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "Alçada de la finestra en píxels"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "TRUE (cert) si la finestra de l'aplicació està maximitzada"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "Dispositiu d'escaneig"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+msgid "SANE device to acquire images from."
+msgstr "Dispositiu SANE per a l'adquisició d'imatges."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "Tipus de document a escanejar"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"El tipus de document que s'està escanejant. Este paràmetre decideix la "
+"resolució d'escaneig, els colors i el processament posterior."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "Direcció de l'escaneig"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "La direcció de l'escànner a través de la pàgina escanejada."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "Amplada de la imatge escanejada en píxels"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
+msgid ""
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
+msgstr ""
+"L'amplada de la imatge escanejada en píxels. Este valor s'ha actualitzat al "
+"que tenia l'última pàgina escanejada."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "Alçada de la imatge escanejada en píxels"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
+msgid ""
+"The height of scanned image in pixels. This value is updated to what the "
+"last scanned page was."
+msgstr ""
+"L'alçada de la imatge escanejada en píxels. Este valor s'ha actualitzat al "
+"que tenia l'última pàgina escanejada."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "Amplada del paper en dècimes de mm"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"L'amplada del paper en dècimes de mm (o 0 per la detecció automàtica del "
+"paper)"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "Alçada del paper en dècimes parts d'un mm"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"L'alçada del paper en dècimes de mm (o 0 per la detecció automàtica del "
+"paper)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "Resolució de l'última imatge escanejada"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
+msgid "The resolution in dots-per-inch of the previously scanned image."
+msgstr ""
+"La resolució en punts per polzada de la imatge prèviament escanejada."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "Resolució per l'escaneig de text"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "La resolució en punts per polzada quan s'escanegi text."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "Resolució per l'escaneig de fotos"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "La resolució en punts per polzada quan s'escanegin fotos."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "Cara de la pàgina a escanejar"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "La cara de la pàgina a escanejar."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "Directori on alçar els fitxers"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"El directori on alçar els fitxers. Per defecte serà el directori de "
+"documents si no es defineix."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr ""
+
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:814
+msgid "No scanners available.  Please connect a scanner."
+msgstr "No hi ha cap escàner disponible. Per favor, connecteu-ne un."
+
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:844
+msgid "Unable to connect to scanner"
+msgstr "No s'ha pogut connectar a l'escàner"
+
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1207
+msgid "Unable to start scan"
+msgstr "No s'ha pogut iniciar l'escaneig"
+
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+msgid "Error communicating with scanner"
+msgstr "S'ha produït un error en comunicar-s'amb l'escàner"
+
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Mostra la versió de llançament"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Mostra els missatges de depuració"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+"Arregla els fitxers PDF generats amb versions anteriors de l'Escaneig senzill"
+
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:297
+msgid "Failed to scan"
+msgstr "Ha fallat l'escaneig"
+
+#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
+#: ../src/simple-scan.vala:316
+msgid "Scanned Document"
+msgstr "Document escanejat"
+
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[DISPOSITIU...] - Utilitat d'escaneig"
+
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
+#, c-format
+msgid "Run '%s --help' to see a full list of available command line options."
+msgstr ""
+"Executeu «%s --help» per veure la llista completa d'opcions disponibles de "
+"la línia d'ordes."
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "Document escanejat.pdf"
+
+#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
+#: ../src/ui.vala:159
+#, c-format
+msgid "Username and password required to access '%s'"
+msgstr "Cal un usuari i contrasenya per a accedir a «%s»"
+
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:202
+msgid "No scanners detected"
+msgstr "No s'ha detectat cap escàner"
+
+#. Hint to user on why there are no scanners detected
+#: ../src/ui.vala:204
+msgid "Please check your scanner is connected and powered on"
+msgstr "Comproveu que l'escàner està connectat i engegat"
+
+#. Save dialog: Dialog title
+#: ../src/ui.vala:363
+msgid "Save As..."
+msgstr "Anomena i alça..."
+
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:377
+msgid "Image Files"
+msgstr "Fitxers d'imatge"
+
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:383
+msgid "All Files"
+msgstr "Tots els fitxers"
+
+#. 
+#: ../src/ui.vala:388
+msgid "Select File _Type"
+msgstr "Seleccioneu el _tipus de fitxer"
+
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF (document multipàgina)."
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (comprimit)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (sense pèrdua)"
+
+#. Title of error dialog when save failed
+#: ../src/ui.vala:503
+msgid "Failed to save file"
+msgstr "No s'ha pogut alçar el fitxer"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:526
+msgid "If you don't save, changes will be permanently lost."
+msgstr "Si no ho alceu, els canvis es perdran per sempre més."
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:563
+msgid "Save current document?"
+msgstr "Voleu alçar el document actual?"
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:565
+msgid "Discard Changes"
+msgstr "Descarta els canvis"
+
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "No s'ha pogut alçar la imatge per previsualitzar-la"
+
+#. Error message display when unable to preview image
+#: ../src/ui.vala:872
+msgid "Unable to open image preview application"
+msgstr "No s'ha pogut obrir l'aplicació de previsualització d'imatges"
+
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1119
+msgid "Unable to open help file"
+msgstr "No s'ha pogut obrir el fitxer d'ajuda"
+
+#. The license this software is under (GPL3+)
+#: ../src/ui.vala:1130
+msgid ""
+"This program is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 3 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program.  If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+"Este programa és programari lliure: podeu redistribuir-lo l'i/o modificar-"
+"lo\n"
+"sota els termes de la Llicència Pública General GNU (GNU GPL) segons publica "
+"la \n"
+"Fundació de Programari Lliure, qualsevol versió 3 de la Llicència, o \n"
+"(si ho trieu) qualsevol versió més recent. \n"
+"\n"
+"Este programa és distribuït en l'esperança que serà útil, \n"
+"però SENSE CAP GARANTIA; fins i tot sense la garantia implicada de \n"
+"MERCANDABILITAT o ADEQUAT PER UN PROPÒSIT PARTICULAR.\n"
+"Vegeu la Llicència Pública General GNU (GNU GPL) per més detalls. \n"
+"\n"
+"Hauríeu d'haver rebut una còpia de la Llicència Pública General GNU (GNU "
+"GPL)\n"
+"juntament amb este programa. Si no, mireu <http://www.gnu.org/licenses/>."
+
+#. Title of about dialog
+#: ../src/ui.vala:1133
+msgid "About Simple Scan"
+msgstr "Quant a l'escaneig senzill"
+
+#. Description of program
+#: ../src/ui.vala:1136
+msgid "Simple document scanning tool"
+msgstr "Eina senzilla d'escaneig de documents"
+
+#: ../src/ui.vala:1145
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  David Planella https://launchpad.net/~dpm\n"
+"  Joan Duran https://launchpad.net/~jodufi"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1156
+msgid "Save document before quitting?"
+msgstr "Voleu alçar el document abans d'eixir?"
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1158
+msgid "Quit without Saving"
+msgstr "Ix sense alçar"
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d ppp (predeterminat)"
+
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1292
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d ppp (esborrany)"
+
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1295
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d ppp (alta resolució)"
+
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
+#, c-format
+msgid "%d dpi"
+msgstr "%d ppp"
+
+#. Title of dialog when cannot load required files
+#: ../src/ui.vala:1333
+msgid "Files missing"
+msgstr "Manquen fitxers"
+
+#. Description in dialog when cannot load required files
+#: ../src/ui.vala:1335
+msgid "Please check your installation"
+msgstr "Comproveu la vostra instal·lació"
+
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1403
+msgid "Change _Scanner"
+msgstr "Canvia l'e_scàner"
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1409
+msgid "Automatic"
+msgstr "Automàtic"
+
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr ""
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr ""
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr ""
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr ""
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr ""
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr ""
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "S'està alçant el document..."
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "S'està alçant la pàgina %d de %d"
+
+#~ msgid ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ msgstr ""
+#~ "La direcció de l'escaneig a través de la pàgina escanejada. Pot ser una de "
+#~ "les següents: «top-to-bottom» (de dalt a baix), «bottom-to-top» (de baix a "
+#~ "dalt), «left-to-right» (d'esquerra a dreta) o «right-to-left» (de dreta a "
+#~ "esquerra)."
+
+#~ msgid ""
+#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ msgstr ""
+#~ "El costat de la pàgina a escanejar. Pot ser un dels següents: «both» "
+#~ "(ambdós), «front» (frontal) o «back» (dorsal)"
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "Forma d'ús:\n"
+#~ "  %s [DISPOSITIU...] - Utilitat d'escaneig"
+
+#, c-format
+#~ msgid ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+#~ msgstr ""
+#~ "Ajuda per a les opcions:\n"
+#~ "  -d, --debug                     Mostra els missatges de depuració\n"
+#~ "  -v, --version                   Mostra la versió del programa\n"
+#~ "  -h, --help                      Mostra l'ajuda de les opcions\n"
+#~ "  --help-all                      Mostra l'ajuda de totes les opcions\n"
+#~ "  --help-gtk                      Mostra l'ajuda de les opcions de la GTK+"
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "Opcions de la GTK+:\n"
+#~ "  --class=CLASSE                  Classe del programa tal com l'utilitza el "
+#~ "gestor de finestres\n"
+#~ "  --name=NOM                      Nom del programa tal com l'utilitza el "
+#~ "gestor de finestres\n"
+#~ "  --screen=PANTALLA               Pantalla X a utilitzar\n"
+#~ "  --sync                          Fa que les crides X siguin síncrones\n"
+#~ "  --gtk-module=MÒDULS             Carrega mòduls de la GTK+ addicionals\n"
+#~ "  --g-fatal-warnings              Fa que tots els avisos siguin fatals"
+
+#~ msgid ""
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
+#~ msgstr ""
+#~ "Tipus de document a escanejar. «text» per documents de text o «photo» per "
+#~ "fotos. Aquest paràmetre decideix la resolució de l'escaneig, els colors i el "
+#~ "postprocessament."
diff --git a/po/cs.po b/po/cs.po
index b4ec46c..2bd5efc 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,325 +7,347 @@ msgid ""
 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-08-13 21:18+0000\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-07-23 08:57+0000\n"
 "Last-Translator: Adrian Guniš <andygun696@gmail.com>\n"
 "Language-Team: Czech <cs@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-10-22 04:47+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:44+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Jednoduché skenování"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr "A_4"
+msgid "_Document"
+msgstr "_Dokument"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr "Sk_enovat"
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "Jedna _stránka"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:10
 msgid "All Pages From _Feeder"
 msgstr "Všechny stránky z _podavače"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr "Zadní"
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
-msgstr "Oříznout"
+msgid "_Stop Scan"
+msgstr "_Zastavit skenování"
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr "Oříznout vybranou stránku"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr "Přední"
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr "Přední a zadní"
-
-#. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr "Le_gal"
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr "Nový"
-
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr "Velikost stránky:"
+msgid "Text"
+msgstr "Text"
 
 #. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
+#: ../data/simple-scan.ui.h:16
 msgid "Photo"
 msgstr "Fotografie"
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr "Předvolby"
-
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
-msgstr "Otočit doleva"
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr "_E-mail"
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr "Otočit doprava"
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr "_Stránka"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
+#: ../data/simple-scan.ui.h:22
 msgid "Rotate _Left"
 msgstr "Otočit do_leva"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
+#: ../data/simple-scan.ui.h:24
 msgid "Rotate _Right"
 msgstr "Otočit dop_rava"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Otočit stránku doleva (proti směru hodinových ručiček)"
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "_Oříznout"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Otočit stránku doprava (po směru hodinových ručiček)"
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "Žád_né"
 
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "_Letter"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "Le_gal"
+
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr "Uložit"
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr "Uložit dokument do souboru"
+msgid "_Custom"
+msgstr "_Vlastní"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr "Sk_enovat"
+msgid "_Rotate Crop"
+msgstr "_Otočit ořez"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
-msgstr "Skenovat"
+msgid "Move Left"
+msgstr "Posunout doleva"
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr "_Zdroj skenování:"
+msgid "Move Right"
+msgstr "Posunout doprava"
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr "Skenovat stranu:"
+msgid "_Help"
+msgstr "_Nápověda"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
-msgstr "Naskenovat jednu stránku ze skeneru"
-
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr "Jednoduché skenování"
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr "Jedna _stránka"
+msgid "_Contents"
+msgstr "_Obsah"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
 msgstr "Vytvořit nový dokument"
 
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "Nový"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "Naskenovat jednu stránku ze skeneru"
+
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
-msgstr "Zastavit"
+msgid "Scan"
+msgstr "Skenovat"
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr "Uložit dokument do souboru"
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "Uložit"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
 msgid "Stop the current scan"
 msgstr "Zastavit probíhající skenování"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr "Text"
-
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr "_Autorizovat"
+msgid "Stop"
+msgstr "Zastavit"
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
-msgstr "_Obsah"
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Otočit stránku doleva (proti směru hodinových ručiček)"
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr "_Oříznout"
+msgid "Rotate Left"
+msgstr "Otočit doleva"
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr "_Vlastní"
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Otočit stránku doprava (po směru hodinových ručiček)"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr "_Dokument"
+msgid "Rotate Right"
+msgstr "Otočit doprava"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "Oříznout vybranou stránku"
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
-msgstr "_E-mail"
+msgid "Crop"
+msgstr "Oříznout"
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr "_Nápověda"
+msgid "_Username for resource:"
+msgstr "_Vlastní pojmenování zdroje:"
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr "_Letter"
+msgid "_Password:"
+msgstr "_Heslo:"
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr "Žád_né"
+msgid "_Authorize"
+msgstr "_Autorizovat"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr "_Stránka"
+msgid "Preferences"
+msgstr "Předvolby"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr "_Heslo:"
+msgid "Scan S_ource:"
+msgstr "_Zdroj skenování:"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
-msgstr "_Rozlišení fotografie:"
+msgid "_Text Resolution:"
+msgstr "_Rozlišení textu:"
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr "_Otočit ořez"
+msgid "_Photo Resolution:"
+msgstr "_Rozlišení fotografie:"
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
-msgstr "_Zastavit skenování"
+msgid "Scan Side:"
+msgstr "Skenovat stranu:"
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
-msgstr "_Rozlišení textu:"
+msgid "Page Size:"
+msgstr "Velikost stránky:"
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
-msgstr "_Vlastní pojmenování zdroje:"
+msgid "Brightness:"
+msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
-msgstr "Naskenovat dokumenty"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
-msgstr "Zařízení určené ke skenování"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
-msgstr "Směr skenování"
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "Přední a zadní"
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
-msgstr "Adresář pro ukládání souborů"
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "Přední"
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
-msgstr "Výška papíru v desetinách milimetru"
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "Zadní"
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr "Výška skenovaného obrázku v pixelech"
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "Naskenovat dokumenty"
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
-msgstr "Strana stránky ke skenování"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "Šířka okna v pixelech"
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
-msgstr "Rozlišení pro skenování fotografií"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "Výška okna v pixelech"
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
-msgstr "Rozlišení pro skenování textu"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "Nastavit na hodnotu PRAVDA, pokud má být okno maximalizované"
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
-msgstr "Rozlišení posledního skenovaného obrázku"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "Zařízení určené ke skenování"
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
 msgstr "Zařízení SANE pro načítání obrázků."
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
-msgstr "Nastavit na hodnotu PRAVDA, pokud má být okno maximalizované"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "Typ skenovaného dokumentu"
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
-"Směr skenování stránky. Jsou dostupné následující možnosti: 'top-to-bottom' "
-"'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Typ skenovaného dokumentu. Toto nastavení rozhoduje o rozlišení skenování, "
+"barvách a následném zpracování."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "Směr skenování"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "Směr skenování stránky."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "Šířka skenovaného obrázku v pixelech"
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
 msgstr ""
-"Adresář pro ukládání souborů. Standardně se ukládají do adresáře Dokumenty, "
-"pokud není nastaveno."
+"Šířka skenovaného obrázku v pixelech. Tato hodnota je přizpůsobena posledně "
+"skenované stránce."
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "Výška skenovaného obrázku v pixelech"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
@@ -333,242 +355,245 @@ msgstr ""
 "Výška skenovaného obrázku v pixelech. Tato hodnota je přizpůsobena posledně "
 "skenované stránce."
 
-#: ../data/simple-scan.schemas.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "Šířka papíru v desetinách milimetru"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Šířka papíru v desetinách milimetru (nebo 0 pro automatické zjištění papíru)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "Výška papíru v desetinách milimetru"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 "Výška papíru v desetinách milimetru (nebo 0 pro automatické zjištění papíru)."
 
-#: ../data/simple-scan.schemas.in.h:16
-msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
-"Strana stránky ke skenování. Může to být jedna z následujících hodnot: "
-"„both“ (obě), „front“ (přední), „back“ (zadní)"
 
-#: ../data/simple-scan.schemas.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "Rozlišení posledního skenovaného obrázku"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
 msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr "Rozlišení posledně skenovaného obrázku v bodech na palec."
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "Rozlišení v bodech na palec použité při skenování fotografií."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "Rozlišení pro skenování textu"
 
-#: ../data/simple-scan.schemas.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "Rozlišení v bodech na palec použité při skenování textu."
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"Šířka skenovaného obrázku v pixelech. Tato hodnota je přizpůsobena posledně "
-"skenované stránce."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "Rozlišení pro skenování fotografií"
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Šířka papíru v desetinách milimetru (nebo 0 pro automatické zjištění papíru)."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "Rozlišení v bodech na palec použité při skenování fotografií."
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
-msgstr "Typ skenovaného dokumentu"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "Strana stránky ke skenování"
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
-msgstr ""
-"Typ skenovaného dokumentu. 'text' pro textové dokumenty, 'photo' pro "
-"fotografie. Toto nastavení rozhoduje o rozlišení skenování, barvách a "
-"následném zpracování."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "Strana stránky ke skenování."
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
-msgstr "Šířka papíru v desetinách milimetru"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "Adresář pro ukládání souborů"
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
-msgstr "Šířka skenovaného obrázku v pixelech"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Adresář pro ukládání souborů. Standardně se ukládají do adresáře Dokumenty, "
+"pokud není nastaveno."
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
-msgstr "Výška okna v pixelech"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
-msgstr "Šířka okna v pixelech"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Není k dispozici žádný skener. Připojte prosím zařízení."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
 msgstr "Nelze navázat spojení se skenerem"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
 msgstr "Nelze zahájit skenování"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
 msgstr "Při komunikaci se skenerem došlo k chybě"
 
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Zobrazit verzi vydání"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Vypisovat debugovací zprávy"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+"Oprava PDF souborů generovaných se starší verzí nástroje Jednoduché skenování"
+
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
 msgstr "Skenování selhalo"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
 msgstr "Skenovaný dokument"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
-msgstr ""
-"Použití:\n"
-"  %s [ZAŘÍZENÍ...] - Skenovací nástroj"
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[ZAŘÍZENÍ...] - Nástroj pro skenování"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
-#, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
-msgstr ""
-"Přepínače nápovědy:\n"
-"  -d, --debug                     Vypisovat ladicí informace\n"
-"  -v, --version                   Zobrazit verzi vydání\n"
-"  -h, --help                      Zobrazit přepínače nápovědy\n"
-"  --help-all                      Zobrazit všechny přepínače nápovědy\n"
-"  --help-gtk                      Zobrazit přepínače GTK+"
-
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
+msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
-"Přepínače GTK+:\n"
-"  --class=TŘÍDA                   Třída programu, jak je použita okenním "
-"správcem\n"
-"  --name=NÁZEV                    Název programu, jak je použit okenním "
-"správcem\n"
-"  --screen=OBRAZOVKA              Obrazovka X, která se má použít\n"
-"  --sync                          Volání X budou synchronní\n"
-"  --gtk-module=MODULY             Načte přídavné moduly GTK+\n"
-"  --g-fatal-warnings              Všechna varování budou kritická"
+"Spustit příkaz „%s --help“ k zobrazení úplného seznamu dostupných přepínačů "
+"příkazové řádky."
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "Naskenovaný dokument.pdf"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Pro přístup k '%s' je vyžadováno uživatelské jméno a heslo"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
 msgstr "Nenalezen žádný skener"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
 msgstr "Zkontrolujte prosím, že je váš skener připojen a zapnut"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr "PDF (vícestránkový dokument)"
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr "JPEG (komprimovaný)"
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr "PNG (bezeztrátový)"
-
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
 msgstr "Uložit jako..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
 msgstr "Soubory obrázků"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
 msgstr "Všechny soubory"
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
 msgstr "Zvolit _typ souboru"
 
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF (vícestránkový dokument)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (komprimovaný)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (bezeztrátový)"
+
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
 msgstr "Uložení souboru selhalo"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Pokud neuložíte, změny budou nenávratně ztraceny."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
 msgstr "Uložit stávající dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
 msgstr "Zahodit změny"
 
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "Nezdařilo se uložit obrázek pro náhled"
+
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
 msgstr "Nelze otevřít aplikaci s náhledem obrázku"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
 msgstr "Nelze otevřít soubor s nápovědou"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -598,78 +623,185 @@ msgstr ""
 "Pokud ne, přečtěte si ji na stránce <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
 msgstr "O aplikaci Jednoduché skenování"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
 msgstr "Jednoduchý nástroj pro skenování dokumentů"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Adrian Guniš https://launchpad.net/~andygun\n"
 "  Jan Hrdina https://launchpad.net/~jan-hrdina\n"
+"  Marv-CZ https://launchpad.net/~marek-manet\n"
+"  Petr R. https://launchpad.net/~ateps-r\n"
 "  Petr Šimáček https://launchpad.net/~petr-simacek\n"
-"  Vitezslav Kotrla https://launchpad.net/~vitezslav-kotrla"
+"  Vitezslav Kotrla https://launchpad.net/~vitezslav-kotrla\n"
+"  Vojtěch Trefný https://launchpad.net/~vojtech.trefny\n"
+"  la_serpe https://launchpad.net/~tom-mil"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
 msgstr "Uložit dokument před ukončením?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
 msgstr "Ukončit bez uložení"
 
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (výchozí)"
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#: ../src/ui.vala:1292
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (náčrt)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
-#, c-format
-msgid "%d dpi"
-msgstr "%d dpi"
-
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (vysoké rozlišení)"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
-msgstr "%d dpi (výchozí)"
+msgid "%d dpi"
+msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
 msgstr "Soubory chybí"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
 msgstr "Zkontrolujte prosím svoji instalaci"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
 msgstr "Změnit _skener"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
-msgstr "Naskenovaný dokument.pdf"
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr ""
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr ""
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr ""
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr ""
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr ""
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr ""
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "Ukládání dokumentu..."
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "Ukládání strany %d z %d"
+
+#~ msgid ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ msgstr ""
+#~ "Směr skenování stránky. Jsou dostupné následující možnosti: 'top-to-bottom' "
+#~ "'bottom-to-top' 'left-to-right' 'right-to-left'"
+
+#~ msgid ""
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
+#~ msgstr ""
+#~ "Typ skenovaného dokumentu. 'text' pro textové dokumenty, 'photo' pro "
+#~ "fotografie. Toto nastavení rozhoduje o rozlišení skenování, barvách a "
+#~ "následném zpracování."
+
+#, c-format
+#~ msgid ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+#~ msgstr ""
+#~ "Přepínače nápovědy:\n"
+#~ "  -d, --debug                     Vypisovat ladicí informace\n"
+#~ "  -v, --version                   Zobrazit verzi vydání\n"
+#~ "  -h, --help                      Zobrazit přepínače nápovědy\n"
+#~ "  --help-all                      Zobrazit všechny přepínače nápovědy\n"
+#~ "  --help-gtk                      Zobrazit přepínače GTK+"
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "Použití:\n"
+#~ "  %s [ZAŘÍZENÍ...] - Skenovací nástroj"
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "Přepínače GTK+:\n"
+#~ "  --class=TŘÍDA                   Třída programu, jak je použita okenním "
+#~ "správcem\n"
+#~ "  --name=NÁZEV                    Název programu, jak je použit okenním "
+#~ "správcem\n"
+#~ "  --screen=OBRAZOVKA              Obrazovka X, která se má použít\n"
+#~ "  --sync                          Volání X budou synchronní\n"
+#~ "  --gtk-module=MODULY             Načte přídavné moduly GTK+\n"
+#~ "  --g-fatal-warnings              Všechna varování budou kritická"
+
+#~ msgid ""
+#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ msgstr ""
+#~ "Strana stránky ke skenování. Může to být jedna z následujících hodnot: "
+#~ "„both“ (obě), „front“ (přední), „back“ (zadní)"
diff --git a/po/da.po b/po/da.po
index 32531cb..eac9b18 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,324 +7,347 @@ msgid ""
 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-07 18:59+0000\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-10-10 12:13+0000\n"
 "Last-Translator: AJenbo <anders@jenbo.dk>\n"
 "Language-Team: Danish <da@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-10-22 04:47+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:44+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Simpel skanning"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr "A_4"
+msgid "_Document"
+msgstr "_Dokument"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr "Sk_an"
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "_Enkelt side"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:10
 msgid "All Pages From _Feeder"
 msgstr "Alle sider fra _arkføderen"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr "Bagside"
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
-msgstr "Beskær"
+msgid "_Stop Scan"
+msgstr "_Stop skanning"
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr "Beskær den markerede side"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr "Forside"
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr "For- og bagside"
-
-#. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr "Le_gal"
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr "Nyt"
-
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr "Sidestørrelse:"
+msgid "Text"
+msgstr "Tekst"
 
 #. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
+#: ../data/simple-scan.ui.h:16
 msgid "Photo"
 msgstr "Billede"
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr "Indstillinger"
-
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
-msgstr "Rotér mod venstre"
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr "_Send med e-post"
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr "Rotér mod højre"
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr "_Side"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
+#: ../data/simple-scan.ui.h:22
 msgid "Rotate _Left"
 msgstr "Rotér mod _venstre"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
+#: ../data/simple-scan.ui.h:24
 msgid "Rotate _Right"
 msgstr "Rotér mod _højre"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Rotér siden mod venstre (mod uret)"
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "_Beskær"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Rotér siden mod højre (med uret)"
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "_Ingen"
 
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "_Letter"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "Le_gal"
+
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr "Gem"
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr "Gem dokument som en fil"
+msgid "_Custom"
+msgstr "_Brugertilpasset"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr "Sk_an"
+msgid "_Rotate Crop"
+msgstr "_Rotér beskæring"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
-msgstr "Skan"
+msgid "Move Left"
+msgstr "Flyt til venstre"
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr "Skanner_kilde:"
+msgid "Move Right"
+msgstr "Flyt til højre"
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr "Skan side:"
+msgid "_Help"
+msgstr "_Hjælp"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
-msgstr "Skan en enkelt side fra skanneren"
-
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr "Simpel skanning"
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr "_Enkelt side"
+msgid "_Contents"
+msgstr "_Indhold"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
 msgstr "Start et nyt dokument"
 
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "Nyt"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "Skan en enkelt side fra skanneren"
+
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
-msgstr "Stop"
+msgid "Scan"
+msgstr "Skan"
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr "Gem dokument som en fil"
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "Gem"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
 msgid "Stop the current scan"
 msgstr "Stop den igangværende skanning"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr "Tekst"
-
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr "_Autorisér"
+msgid "Stop"
+msgstr "Stop"
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
-msgstr "_Indhold"
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Rotér siden mod venstre (mod uret)"
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr "_Beskær"
+msgid "Rotate Left"
+msgstr "Rotér mod venstre"
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr "_Brugertilpasset"
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Rotér siden mod højre (med uret)"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr "_Dokument"
+msgid "Rotate Right"
+msgstr "Rotér mod højre"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "Beskær den markerede side"
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
-msgstr "_Send med e-post"
+msgid "Crop"
+msgstr "Beskær"
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr "_Hjælp"
+msgid "_Username for resource:"
+msgstr "Br_ugernavn for ressource:"
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr "_Letter"
+msgid "_Password:"
+msgstr "_Adgangskode:"
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr "_Ingen"
+msgid "_Authorize"
+msgstr "_Autorisér"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr "_Side"
+msgid "Preferences"
+msgstr "Indstillinger"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr "_Adgangskode:"
+msgid "Scan S_ource:"
+msgstr "Skanner_kilde:"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
-msgstr "_Billedopløsning:"
+msgid "_Text Resolution:"
+msgstr "_Tekstopløsning:"
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr "_Rotér beskæring"
+msgid "_Photo Resolution:"
+msgstr "_Billedopløsning:"
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
-msgstr "_Stop Skanning"
+msgid "Scan Side:"
+msgstr "Skan side:"
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
-msgstr "_Tekstopløsning:"
+msgid "Page Size:"
+msgstr "Sidestørrelse:"
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
-msgstr "Br_ugernavn for ressource:"
+msgid "Brightness:"
+msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
-msgstr "Skan dokumenter"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
-msgstr "Enhed at skanne fra"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
-msgstr "Skanneretning"
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "For- og bagside"
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
-msgstr "Mappe til at gemme filer i"
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "Forside"
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
-msgstr "Højde af papir i tiendedele millimeter"
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "Bagside"
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr "Højde af skannet billede i pixel"
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "Skan dokumenter"
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
-msgstr "Papirside der skal skannes"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "Vinduesbredde i pixel"
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
-msgstr "Opløsning for billedskan"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "Vindueshøjde i pixel"
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
-msgstr "Opløsning for tekstskan"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "SAND hvis programvinduet er maksimeret."
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
-msgstr "Opløsningen af det sidste billede der blev skannet"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "Enhed at skanne fra"
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
 msgstr "SANE-enhed at erhverve billeder fra."
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
-msgstr "SAND hvis programvinduet er maksimeret."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "Type af dokument der bliver skannet"
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
-"Retningen af skanneren på tværs af siden der skannes. Den kan være én af de "
-"følgende: \"top-to-bottom\" \"bottom-to-top\" \"left-to-right\" \"right-to-"
-"left\""
+"Hvilken slags dokument der skal skannes. Denne indstilling bestemmer "
+"opløsningen, farver og efterbehandling."
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "Skanneretning"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "Skannerens retning hen over siden."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "Bredde af skannet billede i pixel"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr "Mappen til at gemme filer i. Som standard bruges dokumentmappen."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
+msgstr ""
+"Bredden af skannede billede i pixel. Denne værdi opdateres svarende til "
+"sidste skannede side."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "Højde af skannet billede i pixel"
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
@@ -332,244 +355,245 @@ msgstr ""
 "Højden af skannede billede i pixel. Denne værdi opdateres svarende til "
 "sidste skannede side."
 
-#: ../data/simple-scan.schemas.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "Bredde af papir i tiendedele millimeter"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Bredde af papir i tiendedele millimeter (eller 0 for automatisk "
+"papirstørelse)"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "Højde af papir i tiendedele millimeter"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 "Højde af papir tiendedele millimeter (eller 0 for automatisk papirstørelse)."
 
-#: ../data/simple-scan.schemas.in.h:16
-msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
-"Papirside der skal skannes. Den kan være følgende: 'both' 'front' 'back'"
 
-#: ../data/simple-scan.schemas.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "Opløsningen af det sidste billede der blev skannet"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
 msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr "Opløsningen i punkter per tomme, på det forrige skannede billede."
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-"Opløsningen i punkter per tomme, der skal bruges når der skannes foto."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "Opløsning for tekstskan"
 
-#: ../data/simple-scan.schemas.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 "Opløsningen i punkter per tomme, der skal bruges når der skannes tekst."
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"Bredden af skannede billede i pixel. Denne værdi opdateres svarende til "
-"sidste skannede side."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "Opløsning for billedskan"
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
-"Bredde af papir i tiendedele millimeter (eller 0 for automatisk "
-"papirstørelse)"
+"Opløsningen i punkter per tomme, der skal bruges når der skannes foto."
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
-msgstr "Type af dokument der bliver skannet"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "Papirside der skal skannes"
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
-msgstr ""
-"Type af dokument der skannes. \"text\" for tekst dokumenter, \"photo\" for "
-"billeder. Denne indstilling træffer valget for skanningsopløsning, farver og "
-"efterbehandling."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "Hvilken side af papiret der skal skannes."
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
-msgstr "Bredde af papir i tiendedele millimeter"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "Mappe til at gemme filer i"
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
-msgstr "Bredde af skannet billede i pixel"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr "Mappen til at gemme filer i. Som standard bruges dokumentmappen."
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
-msgstr "Vindueshøjde i pixel"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
-msgstr "Vinduesbredde i pixel"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Ingen skanner tilgængelig. Tilslut en skanner."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
 msgstr "Kunne ikke forbinde til sḱanner"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
 msgstr "Kunne ikke starte skanning"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
 msgstr "Fejl under kommunikation med skanner."
 
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Vis versionsnummer"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Skriv fejlsøgningsbeskeder"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr "Ret PDF-filer oprettet med ældre versioner af Simple Scan"
+
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
 msgstr "Skanning mislykkedes"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
 msgstr "Skannet dokument"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
-msgstr ""
-"Brug:\n"
-"  %s [ENHED...] - Skanningsværktøj"
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[ENHED...] - Skanningsredskab"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
-#, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
-msgstr ""
-"Hjælpetilvalg:\n"
-"  -d, --debug                     Udskriv fejlfindingsbeskeder\n"
-"  -v, --version                   Vis udgivelsesversion\n"
-"  -h, --help                      Vis hjælp for tilvalg\n"
-"  --help-all                      Vis hjælp for alle tilvalg\n"
-"  --help-gtk                      Vis tilvalg for GTK+"
-
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
+msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
-"GTK+-tilvalg:\n"
-"  --class=KLASSE                  Programklasse, som den bruges af "
-"vindueshåndteringen\n"
-"  --name=NAVN                     Programnavnet, som det bruges af "
-"vindueshåndteringen\n"
-"  --screen=SKÆRM                  X-skærm, der skal bruges\n"
-"  --sync                          Gør X-kald synkrone\n"
-"  --gtk-module=MODULER            Indlæs ekstra GTK+-moduler\n"
-"  --g-fatal-warnings              Gør alle advarsler fatale"
+"Udfør \"%s --help\" for at se den fulde liste af tilgængelige "
+"kommandolinjetilvalg."
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "Skannet dokument.pdf"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Brugernavn og adgangskode er krævet for at tilgå \"%s\""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
 msgstr "Ingen skannere fundet"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
 msgstr "Kontrollér venligst at skanneren er tændt og sluttet til"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr "PDF (flersidet dokument)"
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr "JPEG (komprimeret)"
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr "PNG (tabsfri)"
-
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
 msgstr "Gem som..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
 msgstr "Billedfiler"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
 msgstr "Alle filer"
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
 msgstr "Vælg fil_type"
 
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF (flersidet dokument)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (komprimeret)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (tabsfri)"
+
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
 msgstr "Kunne ikke gemme fil"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Hvis du ikke gemmer, vil ændringer gå permanent tabt."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
 msgstr "Gem nuværende dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
 msgstr "Kassér ændringer"
 
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "Kan ikke gemme billede for forhåndsvisning"
+
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
 msgstr "Kunne ikke åbne programmet til forhåndsvisning af billeder"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
-msgstr "Kunne ikke åbne hjælpfil"
+msgstr "Kan ikke åbne hjælpefil"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -598,80 +622,187 @@ msgstr ""
 "sammen med dette program. Hvis ikke, se <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
 msgstr "Om Simpel skanning"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
 msgstr "Simpelt dokumentskanningsværktøj"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  AJenbo https://launchpad.net/~ajenbo\n"
+"  Aputsiaq Niels Janussen https://launchpad.net/~aj\n"
 "  Ask Hjorth Larsen https://launchpad.net/~askhl\n"
 "  David Nielsen https://launchpad.net/~davidnielsen\n"
+"  Joe Hansen https://launchpad.net/~joedalton2\n"
 "  Kjetil Birkeland Moe https://launchpad.net/~kjetilbmoe\n"
 "  MadsRH https://launchpad.net/~madsrh\n"
-"  Niels Kjøller Hansen https://launchpad.net/~kjoller"
+"  Marcus Møller https://launchpad.net/~marcusmoller\n"
+"  Niels Kjøller Hansen https://launchpad.net/~kjoller\n"
+"  Torben Gundtofte-Bruun https://launchpad.net/~torbengb"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
-msgstr ""
+msgstr "Gem dokumentet før der afsluttes?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
 msgstr "Afslut uden at gemme"
 
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (standard)"
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#: ../src/ui.vala:1292
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (udkast)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
-#, c-format
-msgid "%d dpi"
-msgstr "%d dpi"
-
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (høj opløsning)"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
-msgstr "%d dpi (standard)"
+msgid "%d dpi"
+msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
 msgstr "Filer mangler"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
 msgstr "Kontrollér venligst din installation"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
 msgstr "Skift _skanner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
-msgstr "Skannet dokument.pdf"
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr ""
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr ""
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr ""
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr ""
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr ""
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr ""
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "Gemmer dokument ..."
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "Gemmer side %d ud af %d"
+
+#~ msgid ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ msgstr ""
+#~ "Retningen af skanneren på tværs af siden der skannes. Den kan være én af de "
+#~ "følgende: \"top-to-bottom\" \"bottom-to-top\" \"left-to-right\" \"right-to-"
+#~ "left\""
+
+#~ msgid ""
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
+#~ msgstr ""
+#~ "Type af dokument der skannes. \"text\" for tekst dokumenter, \"photo\" for "
+#~ "billeder. Denne indstilling træffer valget for skanningsopløsning, farver og "
+#~ "efterbehandling."
+
+#, c-format
+#~ msgid ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+#~ msgstr ""
+#~ "Hjælpetilvalg:\n"
+#~ "  -d, --debug                     Udskriv fejlfindingsbeskeder\n"
+#~ "  -v, --version                   Vis udgivelsesversion\n"
+#~ "  -h, --help                      Vis hjælp for tilvalg\n"
+#~ "  --help-all                      Vis hjælp for alle tilvalg\n"
+#~ "  --help-gtk                      Vis tilvalg for GTK+"
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "Brug:\n"
+#~ "  %s [ENHED...] - Skanningsværktøj"
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "GTK+-tilvalg:\n"
+#~ "  --class=KLASSE                  Programklasse, som den bruges af "
+#~ "vindueshåndteringen\n"
+#~ "  --name=NAVN                     Programnavnet, som det bruges af "
+#~ "vindueshåndteringen\n"
+#~ "  --screen=SKÆRM                  X-skærm, der skal bruges\n"
+#~ "  --sync                          Gør X-kald synkrone\n"
+#~ "  --gtk-module=MODULER            Indlæs ekstra GTK+-moduler\n"
+#~ "  --g-fatal-warnings              Gør alle advarsler fatale"
+
+#~ msgid ""
+#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ msgstr ""
+#~ "Papirside der skal skannes. Den kan være følgende: 'both' 'front' 'back'"
diff --git a/po/de.po b/po/de.po
index 122ba6f..59fee5e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,326 +7,347 @@ msgid ""
 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-01 21:54+0000\n"
-"Last-Translator: Daniel Schury <das.surst@googlemail.com>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-07-23 08:58+0000\n"
+"Last-Translator: Daniel Schury <das.surst@gmail.com>\n"
 "Language-Team: German <de@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-10-22 04:47+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:45+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Simple Scan"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr "A_4"
+msgid "_Document"
+msgstr "_Dokument"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr "Sc_annen"
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "_Einzelne Seite"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:10
 msgid "All Pages From _Feeder"
 msgstr "Alle Seiten aus dem _Papiereinzug"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr "Rückseite"
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
-msgstr "Zuschneiden"
+msgid "_Stop Scan"
+msgstr "_Scanvorgang anhalten"
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr "Die gewählte Seite zurecht schneiden"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr "Vorderseite"
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr "Vorder- und Rückseite"
-
-#. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr "US _Legal"
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr "Neu"
-
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr "Seitengröße:"
+msgid "Text"
+msgstr "Text"
 
 #. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
+#: ../data/simple-scan.ui.h:16
 msgid "Photo"
 msgstr "Foto"
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr "Einstellungen"
-
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
-msgstr "Links herum drehen"
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr "_E-Mail"
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr "Rechts herum drehen"
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr "_Seite"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
+#: ../data/simple-scan.ui.h:22
 msgid "Rotate _Left"
 msgstr "_Links herum drehen"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
+#: ../data/simple-scan.ui.h:24
 msgid "Rotate _Right"
 msgstr "_Rechts herum drehen"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Die Seite links herum drehen (Gegen den Uhrzeigersinn)"
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "_Zuschneiden"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Die Seite rechts herum drehen (Mit dem Uhrzeigersinn)"
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "_Nicht zuschneiden"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "US _Letter"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "US _Legal"
 
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr "Speichern"
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr "Als Datei speichern"
+msgid "_Custom"
+msgstr "_Benutzerdefiniert"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr "Sc_annen"
+msgid "_Rotate Crop"
+msgstr "Zuschneideauswahl _drehen"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
-msgstr "Scannen"
+msgid "Move Left"
+msgstr "Nach links schieben"
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr "Scan-_Quelle:"
+msgid "Move Right"
+msgstr "Nach rechts schieben"
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr "Zu scannende Seite:"
+msgid "_Help"
+msgstr "_Hilfe"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
-msgstr "Eine einzelne Seite vom Scanner einscannen"
-
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr "Simple Scan"
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr "Einzelne _Seite"
+msgid "_Contents"
+msgstr "I_nhalt"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
 msgstr "Neues Dokument erstellen"
 
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "Neu"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "Eine einzelne Seite vom Scanner einscannen"
+
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
-msgstr "Anhalten"
+msgid "Scan"
+msgstr "Scannen"
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr "Als Datei speichern"
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "Speichern"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
 msgid "Stop the current scan"
 msgstr "Aktuellen Scanvorgang unterbrechen"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr "Text"
-
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr "_Autorisieren"
+msgid "Stop"
+msgstr "Anhalten"
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
-msgstr "I_nhalt"
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Die Seite links herum drehen (Gegen den Uhrzeigersinn)"
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr "_Zuschneiden"
+msgid "Rotate Left"
+msgstr "Links herum drehen"
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr "_Benutzerdefiniert"
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Die Seite rechts herum drehen (Im Uhrzeigersinn)"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr "_Dokument"
+msgid "Rotate Right"
+msgstr "Rechts herum drehen"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "Die gewählte Seite zurechtschneiden"
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
-msgstr "_E-Mail"
+msgid "Crop"
+msgstr "Zuschneiden"
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr "_Hilfe"
+msgid "_Username for resource:"
+msgstr "_Benutzername für Quelle:"
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr "US _Letter"
+msgid "_Password:"
+msgstr "_Passwort:"
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr "_Nicht zuschneiden"
+msgid "_Authorize"
+msgstr "_Legitimieren"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr "_Seite"
+msgid "Preferences"
+msgstr "Einstellungen"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr "_Passwort:"
+msgid "Scan S_ource:"
+msgstr "Scan-_Quelle:"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
-msgstr "Foto-_Auflösung:"
+msgid "_Text Resolution:"
+msgstr "_Text-Auflösung:"
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr "Zuschneideauswahl _drehen"
+msgid "_Photo Resolution:"
+msgstr "Foto-_Auflösung:"
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
-msgstr "_Scanvorgang anhalten"
+msgid "Scan Side:"
+msgstr "Zu scannende Seite:"
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
-msgstr "_Text-Auflösung:"
+msgid "Page Size:"
+msgstr "Seitengröße:"
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
-msgstr "_Benutzername für Quelle:"
+msgid "Brightness:"
+msgstr "Helligkeit:"
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
-msgstr "Dokumente scannen"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr "Kontrast:"
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
-msgstr "Scangerät"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr "Qualität:"
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
-msgstr "Scanverzeichnis"
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "Vorder- und Rückseite"
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
-msgstr "Verzeichnis, in dem die Dateien gespeichert werden"
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "Vorderseite"
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
-msgstr "Papierhöhe in Zehntelmillimetern"
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "Rückseite"
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr "Höhe des gescannten Bilds in Pixel"
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "Dokumente scannen"
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
-msgstr "Zu scannende Seite des Blattes"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "Fensterbreite in Pixel"
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
-msgstr "Auflösung von Foto-Scans"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "Fensterhöhe in Pixel"
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
-msgstr "Auflösung von Text-Scans"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "TRUE wenn das Anwendungsfenster maximiert ist"
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
-msgstr "Auflösung des zuletzt gescannten Bildes"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "Scangerät"
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
 msgstr "SANE-Gerät, von dem Bilder angefordert werden."
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
-msgstr "TRUE wenn das Anwendungsfenster maximiert ist"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "Typ des zu scannenden Dokuments"
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
-"Die Scanrichtung im Verhältnis zur zu gescannten Seite. Kann eins der "
-"folgenden sein: »Oben nach Unten«, »Unten nach Oben«, »Links nach Rechts« "
-"oder »Rechts nach Links«"
+"Typ des zu scannenden Dokuments. Diese Einstellung entscheidet über die "
+"Auflösung, Farben und Nachbearbeitung."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "Scanverzeichnis"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "Die Richtung des Scanners über die gescannte Seite."
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "Breite des gescannten Bilds in Pixel"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
 msgstr ""
-"Das Verzeichnis, in dem die Dateien gespeichert werden. Vorgabe ist das "
-"Dokumente-Verzeichnis, wenn nicht gesetzt."
+"Die Breite des gescannten Fotos in Pixeln. Der Wert wird entsprechend der "
+"zuletzt gescannten Seite übernommen."
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "Höhe des gescannten Bilds in Pixel"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
@@ -334,246 +355,250 @@ msgstr ""
 "Die Höhe des gescannten Bilds in Pixel. Der Wert wird entsprechend der "
 "zuletzt gescannten Seite übernommen."
 
-#: ../data/simple-scan.schemas.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "Seitenbreite in Zehntelmillimetern"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
-"Papierhöhe in Zehntelmillimetern (oder 0 für automatische Papiererkennung)"
+"Seitenbreite in Zehntelmillimetern (oder 0 für automatische Papiererkennung)"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "Papierhöhe in Zehntelmillimetern"
 
-#: ../data/simple-scan.schemas.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
 msgstr ""
-"Die zu scannende Seite des Papiers. Mögliche Werte sind: »Beide«, "
-"»Vorderseite« und »Rückseite«."
+"Papierhöhe in Zehntelmillimetern (oder 0 für automatische Papiererkennung)"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr "Helligkeit des Scans"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Helligkeitseinstellung von -100 bis 100 (0 keine)."
 
-#: ../data/simple-scan.schemas.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr "Kontrast des Scans"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Kontrasteinstellung von -100 bis 100 (0 keine)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "Auflösung des zuletzt gescannten Bildes"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
 msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr ""
 "Die Auflösung in DPI (Punkte pro Zoll) des zuletzt eingescannten Bildes."
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "Die für Fotos zu verwendende Auflösung in DPI (Punkte pro Zoll)"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "Auflösung von Text-Scans"
 
-#: ../data/simple-scan.schemas.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "Die für Text zu verwendende Auflösung in DPI (Punkte pro Zoll)"
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"Die Breite des gescannten Fotos in Pixeln. Der Wert wird entsprechend der "
-"zuletzt gescannten Seite übernommen."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "Auflösung von Foto-Scans"
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Seitenbreite in Zehntelmillimetern (oder 0 für automatische Papiererkennung)"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "Die für Fotos zu verwendende Auflösung in DPI (Punkte pro Zoll)"
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
-msgstr "Typ des zu scannenden Dokuments"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "Zu scannende Seite des Blattes"
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
-msgstr ""
-"Typ des zu scannenden Dokuments. »Text« steht für Textdokumente, »Foto« für "
-"Fotos. Die Einstellungen bestimmen die Scanauflösung, -Farbe und -"
-"Nachbearbeitung."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "Die zu scannende Seite."
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
-msgstr "Seitenbreite in Zehntelmillimetern"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "Verzeichnis, in dem die Dateien gespeichert werden"
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
-msgstr "Breite des gescannten Bilds in Pixel"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Das Verzeichnis, in dem die Dateien gespeichert werden. Vorgabe ist das "
+"Dokumente-Verzeichnis, wenn nicht gesetzt."
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
-msgstr "Fensterhöhe in Pixel"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr "Qualitätswert für die JPEG-Komprimierung"
 
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
-msgstr "Fensterbreite in Pixel"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr "Qualitätswert, der für die JPEG-Komprimierung verwendet werden soll."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Keine Scanner verfügbar. Bitte schließen Sie einen Scanner an."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
 msgstr "Verbindung zu Scanner konnte nicht hergestellt werden"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
 msgstr "Scanvorgang konnte nicht gestartet werden"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
 msgstr "Fehler bei der Kommunikation mit dem Scanner"
 
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Versionsinformation anzeigen"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Fehlerdiagnosemeldungen anzeigen"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+"Repariere PDF-Dateien, die mit einer älteren Version von Simpe Scan erstellt "
+"wurden"
+
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
 msgstr "Scannen fehlgeschlagen"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
 msgstr "Gescanntes Dokument"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
-msgstr ""
-"Verwendung:\n"
-"  %s [GERÄT...] - Scanwerkzeug"
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[GERÄT …] - Scan-Werkzeug"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
+msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
-"Hilfeoptionen:\n"
-"  -d, --debug                     Zeigt Debug-Nachrichten\n"
-"  -v, --version                   Zeigt Versionsnummer\n"
-"  -h, --help                      Zeigt die Hilfeoptionen\n"
-"  --help-all                      Zeigt alle Hilfeoptionen\n"
-"  --help-gtk                      Zeigt GTK+-Optionen"
-
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
-#, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
-msgstr ""
-"GTK+-Optionen:\n"
-"  --class=KLASSE                   Die vom Fensterverwalter verwendete "
-"Programmklasse\n"
-"  --name=NAME                     Der vom Fensterverwalter verwendete "
-"Programmname\n"
-"  --screen=ANZEIGE                 Zu verwendende X-Anzeige\n"
-"  --sync                          X-Aufrufe synchron durchführen\n"
-"  --gtk-module=MODULE            Zusätzliche GTK+-Module laden\n"
-"  --g-fatal-warnings              All Warnungen werden zu fatalen"
+"Rufen Sie »%s --help« auf, um eine vollständige Liste der verfügbaren "
+"Befehlszeileoptionen zu erhalten."
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "Gescanntes Dokument.pdf"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 "Für den Zugriff auf »%s« werden ein Benutzername und ein Passwort benötigt"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
 msgstr "Kein Scanner gefunden"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
-"Bitte überprüfen Sie, ob ihr Scanner angeschlossen und eingeschaltet ist"
-
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr "PDF (Mehrseitiges Dokument)"
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr "JPEG (Verlustbehaftet)"
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr "PNG (Verlustfrei)"
+"Bitte überprüfen Sie, ob Ihr Scanner angeschlossen und eingeschaltet ist"
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
 msgstr "Speichern unter …"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
 msgstr "Bilddateien"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
 msgstr "Alle Dateitypen"
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
 msgstr "Datei-_Typ auswählen"
 
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF (Mehrseitiges Dokument)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (Verlustbehaftet)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (Verlustfrei)"
+
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
 msgstr "Datei konnte nicht gespeichert werden"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 "Wenn Sie nicht speichern, werden die Änderungen unwiderruflich verworfen."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
 msgstr "Aktuelles Dokument speichern?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
 msgstr "Änderungen verwerfen"
 
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "Vorschaubild kann nicht gespeichert werden"
+
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
 msgstr "Bildvorschauanwendung konnte nicht gestartet werden"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
 msgstr "Die Hilfedatei konnte nicht geöffnet werden"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -607,93 +632,212 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
 msgstr "Über Simple Scan"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
 msgstr "Einfaches Werkzeug zum Scannen von Dokumenten"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
+"  .daniel. https://launchpad.net/~faessje\n"
+"  Alvaro Aleman https://launchpad.net/~alvaroaleman\n"
 "  Charon https://launchpad.net/~markus-lobedann\n"
 "  Daniel Schury https://launchpad.net/~surst\n"
+"  Daniel Winzen https://launchpad.net/~q-d\n"
+"  Dennis Baudys https://launchpad.net/~thecondordb\n"
 "  Dennisgamer https://launchpad.net/~dennis-ertelt\n"
-"  Dominik Grafenhofer https://launchpad.net/~dgrafenhofer\n"
+"  Dominik Grafenhofer https://launchpad.net/~dpjg\n"
+"  EgLe https://launchpad.net/~egle1\n"
+"  Felix https://launchpad.net/~apoapo\n"
 "  Franz E. https://launchpad.net/~franzellendorff\n"
 "  Funky Future https://launchpad.net/~funky-future\n"
+"  Ghenrik https://launchpad.net/~ghenrik-deactivatedaccount\n"
 "  HOMBRESINIESTRO https://launchpad.net/~hombre\n"
 "  Hendrik Brandt https://launchpad.net/~heb\n"
-"  Jan-Christoph Borchardt https://launchpad.net/~jancborchardt\n"
+"  Hendrik Knackstedt https://launchpad.net/~hennekn\n"
+"  Jan https://launchpad.net/~jancborchardt-deactivatedaccount\n"
+"  John Doe https://launchpad.net/~jodo-deactivatedaccount\n"
 "  Julian Gehring https://launchpad.net/~julian-gehring\n"
-"  Lars Vopicka https://launchpad.net/~lars+vopicka\n"
-"  Moritz Baumann https://launchpad.net/~mo-germany\n"
+"  Jörg BUCHMANN https://launchpad.net/~jorg-buchmann\n"
+"  Lars Vopicka https://launchpad.net/~lars+vopicka-deactivatedaccount\n"
+"  Marcel Schmücker https://launchpad.net/~versus666-deactivatedaccount\n"
+"  Martin Lettner https://launchpad.net/~m.lettner\n"
+"  Mathias Dietrich https://launchpad.net/~theghost\n"
+"  Moritz Baumann https://launchpad.net/~mo42\n"
 "  Raphael J. Schmid https://launchpad.net/~raphael-j-schmid\n"
 "  Stefan Buchholz https://launchpad.net/~stef-buchholz\n"
 "  Steve G. https://launchpad.net/~sgo.ger\n"
-"  Thorsten Reinbold https://launchpad.net/~treinbold\n"
+"  Thomas Heidrich https://launchpad.net/~gnuheidix\n"
+"  Webschiff https://launchpad.net/~webschiff\n"
+"  William Glover https://launchpad.net/~williamglover\n"
 "  simon danner https://launchpad.net/~simondanner\n"
 "  staedtler-przyborski https://launchpad.net/~staedtler-przyborski\n"
 "  tlue https://launchpad.net/~tlueber"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
 msgstr "Dokument vor dem Beenden speichern?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
 msgstr "Beenden ohne zu speichern"
 
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (Vorgabe)"
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#: ../src/ui.vala:1292
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (Entwurf)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
-#, c-format
-msgid "%d dpi"
-msgstr "%d dpi"
-
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (Hohe Auflösung)"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
-msgstr "%d dpi (Vorgabe)"
+msgid "%d dpi"
+msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
 msgstr "Dateien nicht gefunden"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
 msgstr "Bitte überprüfen Sie Ihre Installation"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
 msgstr "_Scanner wechseln"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
-msgstr "Gescanntes Dokument.pdf"
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr "Dunkler"
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr "Heller"
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr "Weniger"
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr "Mehr"
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr "Minimum"
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr "Maximum"
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "Dokument wird gespeichert …"
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "Seite %d von %d wird gespeichert"
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "GTK+-Optionen:\n"
+#~ "  --class=KLASSE                   Die vom Fensterverwalter verwendete "
+#~ "Programmklasse\n"
+#~ "  --name=NAME                     Der vom Fensterverwalter verwendete "
+#~ "Programmname\n"
+#~ "  --screen=ANZEIGE                 Zu verwendende X-Anzeige\n"
+#~ "  --sync                          X-Aufrufe synchron durchführen\n"
+#~ "  --gtk-module=MODULE            Zusätzliche GTK+-Module laden\n"
+#~ "  --g-fatal-warnings              All Warnungen werden zu fatalen"
+
+#~ msgid ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ msgstr ""
+#~ "Die Scanrichtung im Verhältnis zur zu gescannten Seite. Kann eins der "
+#~ "folgenden sein: »Oben nach Unten«, »Unten nach Oben«, »Links nach Rechts« "
+#~ "oder »Rechts nach Links«"
+
+#, c-format
+#~ msgid ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+#~ msgstr ""
+#~ "Hilfeoptionen:\n"
+#~ "  -d, --debug                     Zeigt Debug-Nachrichten\n"
+#~ "  -v, --version                   Zeigt Versionsnummer\n"
+#~ "  -h, --help                      Zeigt die Hilfeoptionen\n"
+#~ "  --help-all                      Zeigt alle Hilfeoptionen\n"
+#~ "  --help-gtk                      Zeigt GTK+-Optionen"
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "Verwendung:\n"
+#~ "  %s [GERÄT...] - Scanwerkzeug"
+
+#~ msgid ""
+#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ msgstr ""
+#~ "Die zu scannende Seite des Papiers. Mögliche Werte sind: »Beide«, "
+#~ "»Vorderseite« und »Rückseite«."
+
+#~ msgid ""
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
+#~ msgstr ""
+#~ "Typ des zu scannenden Dokuments. »text« steht für Textdokumente, »photo« für "
+#~ "Fotos. Die Einstellungen bestimmen die Scan-Auflösung, -Farbe und -"
+#~ "Nachbearbeitung."
diff --git a/po/el.po b/po/el.po
index 5efd763..3984aa4 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,327 +7,347 @@ msgid ""
 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-26 11:25+0000\n"
-"Last-Translator: Christos Spyroglou <Unknown>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2013-07-03 07:45+0000\n"
+"Last-Translator: John Pag <ioanpagges@gmail.com>\n"
 "Language-Team: Greek <el@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-10-22 04:47+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:45+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Σάρωση"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr "A_4"
+msgid "_Document"
+msgstr "_Έγγραφο"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr "_Σάρωση"
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "Μια_σελίδα"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:10
 msgid "All Pages From _Feeder"
 msgstr "Όλες τις σελίδες από την _τροφοδοσία"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr ""
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
-msgstr "Περικοπή"
+msgid "_Stop Scan"
+msgstr "_Διακοπή σάρωσης"
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr "Περικοπή της επιλεγμένης σελίδας"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr ""
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr ""
-
-#. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr "Le_gal"
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr "Νέο"
-
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr ""
+msgid "Text"
+msgstr "ΚΕΙΜΕΝΟ"
 
 #. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
+#: ../data/simple-scan.ui.h:16
 msgid "Photo"
 msgstr "Φωτογραφία"
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr "Προτιμήσεις"
-
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
-msgstr "Περιστροφή αριστερά"
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr "_Email"
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr "Περιστροφή δεξιά"
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr "_Σελίδα"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
+#: ../data/simple-scan.ui.h:22
 msgid "Rotate _Left"
 msgstr "Περιστροφή _αριστερά"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
+#: ../data/simple-scan.ui.h:24
 msgid "Rotate _Right"
 msgstr "Περιστροφή _δεξιά"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Περιστροφή της σελίδας αριστερά"
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "_Περικοπή"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Περιστροφή της σελίδας δεξιά"
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "_Κανένα"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "_Letter"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "Le_gal"
 
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr "Αποθήκευση"
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr "Αποθήκευση εγγράφου σε αρχείο"
+msgid "_Custom"
+msgstr "_Προσαρμοσμένο"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr "_Σάρωση"
+msgid "_Rotate Crop"
+msgstr "_Περιστροφή περικοπής"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
-msgstr "Σάρωση"
+msgid "Move Left"
+msgstr "Μετακίνηση αριστερά"
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr "_Πηγή σάρωσης:"
+msgid "Move Right"
+msgstr "Μετακίνηση δεξιά"
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr ""
+msgid "_Help"
+msgstr "_Βοήθεια"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
-msgstr "Σάρωση μίας σελίδας από τον σαρωτή"
-
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr "Σάρωση"
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr "_Μία σελίδα"
+msgid "_Contents"
+msgstr "_Περιεχόμενα"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
 msgstr "Δημιουργία νέου εγγράφου"
 
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "Νέο"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "Σάρωση μίας σελίδας από τον σαρωτή"
+
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
-msgstr "Διακοπή"
+msgid "Scan"
+msgstr "Σάρωση"
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr "Αποθήκευση εγγράφου σε αρχείο"
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "Αποθήκευση"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
 msgid "Stop the current scan"
 msgstr "Διακοπή τρέχουσας σάρωσης"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr "Κείμενο"
-
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr "_Εξουσιοδότηση"
+msgid "Stop"
+msgstr "Διακοπή"
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
-msgstr "_Περιεχόμενα"
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Περιστροφή της σελίδας αριστερά"
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr "_Περικοπή"
+msgid "Rotate Left"
+msgstr "Περιστροφή αριστερά"
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr "_Προσαρμοσμένο"
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Περιστροφή της σελίδας δεξιά"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr "Έ_γγραφο"
+msgid "Rotate Right"
+msgstr "Περιστροφή δεξιά"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "Περικοπή της επιλεγμένης σελίδας"
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
-msgstr "_Email"
+msgid "Crop"
+msgstr "Περικοπή"
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr "_Βοήθεια"
+msgid "_Username for resource:"
+msgstr "Όνομα _χρήστη για πόρο:"
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr "_Letter"
+msgid "_Password:"
+msgstr "_Κωδικός:"
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr "_Κανένα"
+msgid "_Authorize"
+msgstr "_Εξουσιοδότηση"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr "_Σελίδα"
+msgid "Preferences"
+msgstr "Προτιμήσεις"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr "_Κωδικός:"
+msgid "Scan S_ource:"
+msgstr "_Πηγή σάρωσης:"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
-msgstr "Ανάλυση _φωτογραφίας:"
+msgid "_Text Resolution:"
+msgstr "Ανάλυση _κειμένου:"
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr "_Περιστροφή περικοπής"
+msgid "_Photo Resolution:"
+msgstr "Ανάλυση _φωτογραφίας:"
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
-msgstr "_Διακοπή σάρωσης"
+msgid "Scan Side:"
+msgstr "Πλευρά σάρωσης"
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
-msgstr "Ανάλυση _κειμένου:"
+msgid "Page Size:"
+msgstr "Μέγεθος σελίδας:"
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
-msgstr "Όνομα _χρήστη για πόρο:"
+msgid "Brightness:"
+msgstr "Φωτεινότητα:"
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
-msgstr "Σάρωση εγγράφων"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr "Αντίθεση:"
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
-msgstr "Συσκευή που χρησιμοποιείται για σάρωση"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr "Ποιότητα:"
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
-msgstr "Κατεύθυνση σάρωσης"
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "Πρόσοψη και πίσω όψη"
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
-msgstr "Κατάλογος στον οποίο θα αποθηκευτούν τα αρχεία"
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "Πρόσοψη"
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
-msgstr ""
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "Πίσω όψη"
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr "Ύψος εικόνας σάρωσης σε εικονοστοιχεία"
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "Σάρωση εγγράφων"
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "Πλάτος παραθύρου σε εικονοστοιχεία"
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
-msgstr "Ανάλυση για σάρωση φωτογραφιών"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "Ύψος παραθύρου σε εικονοστοιχεία"
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
-msgstr "Ανάλυση για σάρωση κειμένου"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "ΑΛΗΘΕΣ αν το παράθυρο της εφαρμογής είναι μεγιστοποιημένο"
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
-msgstr "Ανάλυση τελευταίας σαρωμένης εικόνας"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "Συσκευή που χρησιμοποιείται για σάρωση"
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
 msgstr "Συσκευή SANE που χρησιμοποιείται για την λήψη εικόνων."
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
-msgstr "ΑΛΗΘΕΣ αν το παράθυρο της εφαρμογής είναι μεγιστοποιημένο"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "Ο τύπος του εγγράφου που σαρώνεται"
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
-"Η κατεύθυνση του σαρωτή κατά μήκος της σαρωμένης σελίδας. Μπορεί να είναι "
-"κάποιο από τα εξής: 'top-to-bottom' (από πάνω προς τα κάτω) 'bottom-to-top' "
-"(από κάτω προς τα πάνω) 'left-to-right' (από αριστερά προς δεξιά) 'right-to-"
-"left' (από δεξιά προς αριστερά)"
+"Ο τύπος του έγγραφου που σαρώνεται.  Αυτή η ρύθμιση καθορίζει την ανάλυση, "
+"το χρώμα και την μετα-επεξεργασία της σάρωσης."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "Κατεύθυνση σάρωσης"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "Ο προσανατολισμός του σαρωτή  στη σαρωμένη σελίδα"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "Πλάτος της σαρωμένης εικόνας σε εικονοστοιχεία"
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
 msgstr ""
-"Ο κατάλογος στον οποίο θα αποθηκευτούν τα αρχεία. Αν δεν ορισθεί, προεπιλογή "
-"είναι ο κατάλογος εγγράφων."
+"Το πλάτος της σαρωμένης εικόνας σε εικονοστοιχεία. Η τιμή αυτή ενημερώνεται "
+"με το πλάτος της τελευταίας σαρωμένης σελίδας."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "Ύψος εικόνας σάρωσης σε εικονοστοιχεία"
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
@@ -335,243 +355,253 @@ msgstr ""
 "Το ύψος της σαρωμένης εικόνας σε εικονοστοιχεία. Η τιμή αυτή ενημερώνεται με "
 "το ύψος της τελευταίας σαρωμένης σελίδας."
 
-#: ../data/simple-scan.schemas.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "Πλάτος του χαρτιού σε δέκατα του χιλιοστού (mm)"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
+"Πλάτος του χαρτιού σε δέκατα του χιλιοστού (mm) (ή 0 για την αυτόματη "
+"ανίχνευση χαρτιού)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "Ύψος σελίδας σε δέκατα του χιλιοστού (mm)"
 
-#: ../data/simple-scan.schemas.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
 msgstr ""
+"Ύψος του χαρτιού σε δέκατα του χιλιοστού (mm) (ή 0 για την αυτόματη "
+"ανίχνευση χαρτιού)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr "Φωτεινότητα σάρωσης"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Προσαρμογή της φωτεινότητας από -100 έως 100 (0 χωρίς προσαρμογή)"
 
-#: ../data/simple-scan.schemas.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr "Αντίθεση σάρωσης"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Προσαρμογή της αντίθεσης από -100 έως 100 (0 χωρίς προσαρμογή)"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "Ανάλυση τελευταίας σαρωμένης εικόνας"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
 msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr "Η ανάλυση σε κουκκίδες ανά ίντσα της προηγούμενης σαρωμένης εικόνας."
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-"Η ανάλυση σε κουκκίδες ανά ίντσα που θα χρησιμοποιηθεί στην σάρωση "
-"φωτογραφιών."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "Ανάλυση για σάρωση κειμένου"
 
-#: ../data/simple-scan.schemas.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 "Η ανάλυση σε κουκκίδες ανά ίντσα που θα χρησιμοποιηθεί στην σάρωση κειμένων."
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"Το πλάτος της σαρωμένης εικόνας σε εικονοστοιχεία. Η τιμή αυτή ενημερώνεται "
-"με το πλάτος της τελευταίας σαρωμένης σελίδας."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "Ανάλυση για σάρωση φωτογραφιών"
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
+"Η ανάλυση σε κουκκίδες ανά ίντσα που θα χρησιμοποιηθεί στην σάρωση "
+"φωτογραφιών."
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
-msgstr "Ο τύπος του εγγράφου που σαρώνεται"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "Πλευρά σελίδας για σάρωση"
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
-msgstr ""
-"Ο τύπος του εγγράφου που σαρώνεται. 'text' για έγγραφα κειμένου, 'photo' για "
-"φωτογραφίες. Αυτή η ρύθμιση καθορίζει την ανάλυση σάρωσης, τα χρώματα και τη "
-"μετέπειτα επεξεργασία."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "Η πλευρά της σελίδας για σάρωση."
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "Κατάλογος στον οποίο θα αποθηκευτούν τα αρχεία"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
+"Ο κατάλογος στον οποίο θα αποθηκευτούν τα αρχεία. Αν δεν ορισθεί, προεπιλογή "
+"είναι ο κατάλογος εγγράφων."
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
-msgstr "Πλάτος της σαρωμένης εικόνας σε εικονοστοιχεία"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr "Τιμή της ποιότητας που θα χρησιμοποιηθεί για τη συμπίεση JPEG"
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
-msgstr "Ύψος παραθύρου σε εικονοστοιχεία"
-
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
-msgstr "Πλάτος παραθύρου σε εικονοστοιχεία"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr "Τιμή της ποιότητας που θα χρησιμοποιηθεί για τη συμπίεση JPEG."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Δεν υπάρχουν διαθέσιμοι σαρωτές. Παρακαλούμε συνδέστε ένα σαρωτή."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
 msgstr "Αδύνατη η σύνδεση με τον σαρωτή"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
 msgstr "Αδύνατη η εκκίνηση της σάρωσης"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
 msgstr "Σφάλμα κατά την επικοινωνία με τον σαρωτή"
 
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Προβολή αριθμού έκδοσης"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Εμφάνιση μηνυμάτων εντοπισμού σφαλμάτων"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+"Διόρθωση αρχείων PDF που δημιουργήθηκαν με παλαιότερες εκδόσεις του "
+"λογισμικού Simple Scan"
+
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
 msgstr "Η σάρωση απέτυχε"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
 msgstr "Σαρωμένο"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
-msgstr ""
-"Χρήση:\n"
-"  %s [ΣΥΣΚΕΥΗ...] - Εφαρμογή σάρωσης"
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[ΣΥΣΚΕΥΗ…] - Εφαρμογή σάρωσης"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
+msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
-"Επιλογές βοήθειας:\n"
-"  -d, --debug Εμφάνιση μηνυμάτων αποσφαλμάτωσης\n"
-"  -v, --version Εμφάνιση αριθμού έκδοσης\n"
-"  -h, --help Εμφάνιση επιλογών βοήθειας\n"
-"  --help-all Εμφάνιση όλων των επιλογών βοήθειας\n"
-"  --help-gtk Εμφάνιση επιλογών GTK+"
-
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
-#, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
-msgstr ""
-"Επιλογές GTK+:\n"
-"  --class=CLASS                   Κλάση προγράμματος χρησιμοποιούμενη από το "
-"διαχειριστή παραθύρων\n"
-"  --name=NAME                     Όνομα προγράμματος χρησιμοποιούμενο από το "
-"διαχειριστή παραθύρων\n"
-"  --screen=SCREEN                 Οθόνη X προς χρήση\n"
-"  --sync                          Να είναι σύγχρονες οι κλήσεις στο X\n"
-"  --gtk-module=MODULES            Φόρτωση πρόσθετων αρθρωμάτων GTK+\n"
-"  --g-fatal-warnings              Να είναι όλες οι προειδοποιήσεις μοιραίες"
+"Εκτελέστε «%s --help» για να δείτε την πλήρη λίστα των διαθέσιμων επιλογών "
+"εντολής γραμμής."
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "Σαρωμένο.pdf"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Απαιτείται όνομα χρήστη και κωδικός για την πρόσβαση στο '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
 msgstr "Δεν ανιχνεύθηκαν σαρωτές"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "Παρακαλούμε βεβαιωθείτε ότι ο σαρωτής σας είναι συνδεδεμένος και σε "
 "λειτουργία"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr "PDF (έγγραφο πολλαπλών σελίδων)"
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr "JPEG (συμπιεσμένο)"
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr "PNG (δίχως συμπίεση)"
-
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
 msgstr "Αποθήκευση ως..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
 msgstr "Αρχεία εικόνων"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
 msgstr "Όλα τα αρχεία"
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
 msgstr "Επιλογή _τύπου αρχείου"
 
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF (έγγραφο πολλαπλών σελίδων)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (συμπιεσμένο)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (δίχως συμπίεση)"
+
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
 msgstr "Αποτυχία αποθήκευσης του αρχείου"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
-msgstr ""
+msgstr "Αν δεν αποθηκεύσετε, οι αλλαγές θα χαθούν μόνιμα."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
-msgstr ""
+msgstr "Αποθήκευση του τρέχοντος εγγράφου;"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
-msgstr ""
+msgstr "Απόρριψη αλλαγών"
+
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "Αδυναμία αποθήκευσης σελίδας για προεπισκόπηση"
 
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
 msgstr "Αδύνατο το άνοιγμα της εφαρμογής προβολής εικόνων"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
 msgstr "Αδύνατο το άνοιγμα του αρχείου βοήθειας"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -603,78 +633,186 @@ msgstr ""
 "εδώ: <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
 msgstr "Περί Σάρωσης"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
 msgstr "Απλό εργαλείο σάρωσης εγγράφων"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Alex Ferguson https://launchpad.net/~thoughtmonster\n"
 "  Christos Spyroglou https://launchpad.net/~cspyroglou\n"
+"  Filippos Kolyvas https://launchpad.net/~fkol-k4\n"
+"  George Christofis https://launchpad.net/~geochr\n"
 "  Jennie Petoumenou https://launchpad.net/~jennie\n"
-"  Thanos Lefteris https://launchpad.net/~alefteris"
+"  John Pag https://launchpad.net/~ioanpagges\n"
+"  Michael Kotsarinis https://launchpad.net/~mk73628\n"
+"  Robert Ancell https://launchpad.net/~robert-ancell\n"
+"  Simos Xenitellis https://launchpad.net/~simosx\n"
+"  Thanos Lefteris https://launchpad.net/~alefteris\n"
+"  stavros daliakopoulos https://launchpad.net/~stavrosd\n"
+"  tomash.ghz https://launchpad.net/~ghz-tomash\n"
+"  trix https://launchpad.net/~panelc"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
-msgstr ""
+msgstr "Αποθήκευση του εγγράφου πριν την έξοδο;"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
-msgstr ""
+msgstr "Έξοδος χωρίς Αποθήκευση"
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (προεπιλογή)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#: ../src/ui.vala:1292
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (πρόχειρο)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
-#, c-format
-msgid "%d dpi"
-msgstr "%d dpi"
-
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (υψηλή ανάλυση)"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
-msgstr "%d dpi (προεπιλογή)"
+msgid "%d dpi"
+msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
 msgstr "Λείπουν αρχεία"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
 msgstr "Παρακαλούμε ελέγξτε την εγκατάσταση σας"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
 msgstr "Αλλαγή _σαρωτή"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
-msgstr ""
+msgstr "Αυτόματο"
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
-msgstr "Σαρωμένο.pdf"
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr "Σκοτεινότερο"
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr "Φωτεινότερο"
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr "Λιγότερο"
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr "Περισσότερο"
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr "Ελάχιστο"
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr "Μέγιστο"
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "Αποθήκευση εγγράφου..."
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "Αποθήκευση σελίδας %d από %d"
+
+#~ msgid ""
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
+#~ msgstr ""
+#~ "Ο τύπος του εγγράφου που σαρώνεται. 'text' για έγγραφα κειμένου, 'photo' για "
+#~ "φωτογραφίες. Αυτή η ρύθμιση καθορίζει την ανάλυση σάρωσης, τα χρώματα και τη "
+#~ "μετέπειτα επεξεργασία."
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "Χρήση:\n"
+#~ "  %s [ΣΥΣΚΕΥΗ...] - Εφαρμογή σάρωσης"
+
+#, c-format
+#~ msgid ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+#~ msgstr ""
+#~ "Επιλογές βοήθειας:\n"
+#~ "  -d, --debug Εμφάνιση μηνυμάτων αποσφαλμάτωσης\n"
+#~ "  -v, --version Εμφάνιση αριθμού έκδοσης\n"
+#~ "  -h, --help Εμφάνιση επιλογών βοήθειας\n"
+#~ "  --help-all Εμφάνιση όλων των επιλογών βοήθειας\n"
+#~ "  --help-gtk Εμφάνιση επιλογών GTK+"
+
+#~ msgid ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ msgstr ""
+#~ "Η κατεύθυνση του σαρωτή κατά μήκος της σαρωμένης σελίδας. Μπορεί να είναι "
+#~ "κάποιο από τα εξής: 'top-to-bottom' (από πάνω προς τα κάτω) 'bottom-to-top' "
+#~ "(από κάτω προς τα πάνω) 'left-to-right' (από αριστερά προς δεξιά) 'right-to-"
+#~ "left' (από δεξιά προς αριστερά)"
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "Επιλογές GTK+:\n"
+#~ "  --class=CLASS                   Κλάση προγράμματος χρησιμοποιούμενη από το "
+#~ "διαχειριστή παραθύρων\n"
+#~ "  --name=NAME                     Όνομα προγράμματος χρησιμοποιούμενο από το "
+#~ "διαχειριστή παραθύρων\n"
+#~ "  --screen=SCREEN                 Οθόνη X προς χρήση\n"
+#~ "  --sync                          Να είναι σύγχρονες οι κλήσεις στο X\n"
+#~ "  --gtk-module=MODULES            Φόρτωση πρόσθετων αρθρωμάτων GTK+\n"
+#~ "  --g-fatal-warnings              Να είναι όλες οι προειδοποιήσεις μοιραίες"
diff --git a/po/en_GB.po b/po/en_GB.po
index 8d1186a..cbca51d 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,323 +7,347 @@ msgid ""
 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-08-15 13:46+0000\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-07-23 08:58+0000\n"
 "Last-Translator: James Thorrold <jameslin@inbox.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@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-10-22 04:48+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Simple Scan"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr "A_4"
+msgid "_Document"
+msgstr "_Document"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr "Sc_an"
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "Single _Page"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:10
 msgid "All Pages From _Feeder"
 msgstr "All Pages From _Feeder"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr "Back"
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
-msgstr "Crop"
+msgid "_Stop Scan"
+msgstr "_Stop Scan"
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr "Crop the selected page"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr "Front"
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr "Front and Back"
-
-#. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr "Le_gal"
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr "New"
-
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr "Page Size:"
+msgid "Text"
+msgstr "Text"
 
 #. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
+#: ../data/simple-scan.ui.h:16
 msgid "Photo"
 msgstr "Photo"
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr "Preferences"
-
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
-msgstr "Rotate Left"
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr "_E-mail"
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr "Rotate Right"
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr "_Page"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
+#: ../data/simple-scan.ui.h:22
 msgid "Rotate _Left"
 msgstr "Rotate _Left"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
+#: ../data/simple-scan.ui.h:24
 msgid "Rotate _Right"
 msgstr "Rotate _Right"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Rotate the page to the left (anti-clockwise)"
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "_Crop"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Rotate the page to the right (clockwise)"
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "_None"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
 
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "_Letter"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "Le_gal"
+
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr "Save"
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr "Save document to a file"
+msgid "_Custom"
+msgstr "_Custom"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr "Sc_an"
+msgid "_Rotate Crop"
+msgstr "_Rotate Crop"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
-msgstr "Scan"
+msgid "Move Left"
+msgstr "Move Left"
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr "Scan S_ource:"
+msgid "Move Right"
+msgstr "Move Right"
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr "Scan Side:"
+msgid "_Help"
+msgstr "_Help"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
-msgstr "Scan a single page from the scanner"
-
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr "Simple Scan"
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr "Single _Page"
+msgid "_Contents"
+msgstr "_Contents"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
 msgstr "Start a new document"
 
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "New"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "Scan a single page from the scanner"
+
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
-msgstr "Stop"
+msgid "Scan"
+msgstr "Scan"
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr "Save document to a file"
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "Save"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
 msgid "Stop the current scan"
 msgstr "Stop the current scan"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr "Text"
-
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr "_Authorise"
+msgid "Stop"
+msgstr "Stop"
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
-msgstr "_Contents"
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Rotate the page to the left (anti-clockwise)"
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr "_Crop"
+msgid "Rotate Left"
+msgstr "Rotate Left"
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr "_Custom"
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Rotate the page to the right (clockwise)"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr "_Document"
+msgid "Rotate Right"
+msgstr "Rotate Right"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "Crop the selected page"
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
-msgstr "_E-mail"
+msgid "Crop"
+msgstr "Crop"
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr "_Help"
+msgid "_Username for resource:"
+msgstr "_Username for resource:"
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr "_Letter"
+msgid "_Password:"
+msgstr "_Password:"
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr "_None"
+msgid "_Authorize"
+msgstr "_Authorise"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr "_Page"
+msgid "Preferences"
+msgstr "Preferences"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr "_Password:"
+msgid "Scan S_ource:"
+msgstr "Scan S_ource:"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
-msgstr "_Photo Resolution:"
+msgid "_Text Resolution:"
+msgstr "_Text Resolution:"
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr "_Rotate Crop"
+msgid "_Photo Resolution:"
+msgstr "_Photo Resolution:"
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
-msgstr "_Stop Scan"
+msgid "Scan Side:"
+msgstr "Scan Side:"
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
-msgstr "_Text Resolution:"
+msgid "Page Size:"
+msgstr "Page Size:"
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
-msgstr "_Username for resource:"
+msgid "Brightness:"
+msgstr "Brightness:"
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
-msgstr "Scan Documents"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr "Contrast:"
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
-msgstr "Device to scan from"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr "Quality:"
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
-msgstr "Direction of scan"
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "Front and Back"
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
-msgstr "Directory to save files to"
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "Front"
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
-msgstr "Height of paper in tenths of a mm"
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "Back"
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr "Height of scanned image in pixels"
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "Scan Documents"
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
-msgstr "Page side to scan"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "Window width (in pixels)"
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
-msgstr "Resolution for photo scans"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "Window height (in pixels)"
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
-msgstr "Resolution for text scans"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "TRUE if the application window is maximised"
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
-msgstr "Resolution of last scanned image"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "Device to scan from"
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
 msgstr "SANE device to acquire images from."
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
-msgstr "TRUE if the application window is maximised"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "Type of document being scanned"
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colours and post-processing."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "Direction of scan"
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "The direction of the scanner across the scanned page."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "Width of scanned image (in pixels)"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr "The folder where files are saved. Default is the Documents folder."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
+msgstr ""
+"The width of scanned image in pixels. This value is updated to the width of "
+"the last image scanned."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "Height of scanned image (in pixels)"
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
@@ -331,243 +355,243 @@ msgstr ""
 "The height of scanned image in pixels. This value is updated to the height "
 "of the last image scanned."
 
-#: ../data/simple-scan.schemas.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "Width of paper (in tenths of a mm)"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 
-#: ../data/simple-scan.schemas.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "Height of paper (in tenths of a mm)"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
 msgstr ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr "Brightness of scan"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "The brightness adjustment from -100 to 100 (0 being none)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr "Contrast of scan"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "The contrast adjustment from -100 to 100 (0 being none)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "Resolution of last scanned image"
 
-#: ../data/simple-scan.schemas.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
 msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr "The resolution of the last image scanned (in dots-per-inch)."
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "The resolution in dots-per-inch to use when scanning photos."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "Resolution for text scans"
 
-#: ../data/simple-scan.schemas.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "The resolution in dots-per-inch to use when scanning text."
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"The width of scanned image in pixels. This value is updated to the width of "
-"the last image scanned."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "Resolution for photo scans"
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "The resolution in dots-per-inch to use when scanning photos."
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
-msgstr "Type of document being scanned"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "Page side to scan"
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
-msgstr ""
-"Type of document being scanned. 'Text' for text documents, 'Photo' for "
-"photos. This determines the scan resolution, colour and post-processing "
-"settings."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "The page side to scan."
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
-msgstr "Width of paper in tenths of a mm"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "Directory to save files to"
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
-msgstr "Width of scanned image (in pixels)"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr "The folder where files are saved. Default is the Documents folder."
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
-msgstr "Window height (in pixels)"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr "Quality value to use for JPEG compression"
 
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
-msgstr "Window width (in pixels)"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr "Quality value to use for JPEG compression."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
 msgstr "No scanners available.  Please connect a scanner."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
 msgstr "Unable to connect to scanner"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
 msgstr "Unable to start scan"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
 msgstr "Error communicating with scanner"
 
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Show release version"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Print debugging messages"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr "Fix PDF files generated with older versions of Simple Scan"
+
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
 msgstr "Failed to scan"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
 msgstr "Scanned Document"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
-msgstr ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[DEVICE...] - Scanning utility"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
+msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
-
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
-#, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
-msgstr ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
+"Run '%s --help' to see a full list of available command line options."
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "Scanned Document.pdf"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Username and password required to access '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
 msgstr "No scanners detected"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
 msgstr "Please check your scanner is connected and powered on"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr "PDF (multi-page document)"
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr "JPEG (compressed)"
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr "PNG (lossless)"
-
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
-msgstr "Save As…"
+msgstr "Save As..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
 msgstr "Image Files"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
 msgstr "All Files"
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
 msgstr "Select File _Type"
 
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF (multi-page document)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (compressed)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (lossless)"
+
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
 msgstr "Failed to save file"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
 msgstr "If you don't save, changes will be permanently lost."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
 msgstr "Save current document?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
 msgstr "Discard Changes"
 
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "Unable to save image for preview"
+
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
 msgstr "Unable to open image preview application"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
 msgstr "Unable to open help file"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -596,79 +620,188 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
 msgstr "About Simple Scan"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
 msgstr "Simple document scanning tool"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Alex Denvir https://launchpad.net/~coldfff\n"
+"  Andi Chandler https://launchpad.net/~bing\n"
+"  Anthony Harrington https://launchpad.net/~untaintableangel\n"
+"  Anthony Scarth https://launchpad.net/~maroubal2\n"
+"  GeorgeB https://launchpad.net/~solar.george\n"
+"  James Thorrold https://launchpad.net/~jthorrold\n"
 "  Jonathon Hodges https://launchpad.net/~jonblondie\n"
 "  Kaustav Das Modak https://launchpad.net/~kaustav-dasmodak\n"
 "  Malcolm Parsons https://launchpad.net/~malcolm-parsons\n"
-"  solar.george https://launchpad.net/~solar.george"
+"  Narender Suri https://launchpad.net/~chetan-vidur\n"
+"  Robert Readman https://launchpad.net/~robert-readman\n"
+"  Tomasz Chabowski https://launchpad.net/~tomasz-chabowski-googlemail"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
 msgstr "Save document before quitting?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
 msgstr "Quit without Saving"
 
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (default)"
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#: ../src/ui.vala:1292
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draft)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
-#, c-format
-msgid "%d dpi"
-msgstr "%d dpi"
-
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (high resolution)"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
-msgstr "%d dpi (default)"
+msgid "%d dpi"
+msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
 msgstr "Files missing"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
 msgstr "Please check your installation"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
 msgstr "Change _Scanner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
 msgstr "Automatic"
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
-msgstr "Scanned Document.pdf"
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr "Darker"
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr "Lighter"
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr "Less"
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr "More"
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr "Minimum"
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr "Maximum"
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "Saving document..."
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "Saving page %d out of %d"
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+
+#~ msgid ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ msgstr ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+
+#~ msgid ""
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
+#~ msgstr ""
+#~ "Type of document being scanned. 'Text' for text documents, 'Photo' for "
+#~ "photos. This determines the scan resolution, colour and post-processing "
+#~ "settings."
+
+#, c-format
+#~ msgid ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+#~ msgstr ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+
+#~ msgid ""
+#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ msgstr ""
+#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
diff --git a/po/eo.po b/po/eo.po
index ff3bd61..b8903b5 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -2,541 +2,598 @@
 # Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
 # This file is distributed under the same license as the simple-scan package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
+# Tiffany Antopolski <tiffany.antopolski@gmail.com>, 2011.
 msgid ""
 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-22 11:02+0000\n"
-"Last-Translator: Eliovir <Unknown>\n"
-"Language-Team: Esperanto <eo@li.org>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-08-16 11:04+0000\n"
+"Last-Translator: Michael Moroni <michael.moroni@mailoo.org>\n"
+"Language-Team: Esperanto\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-22 04:47+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:44+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
+"Language: eo\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Simpla skano"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr ""
+msgid "_Document"
+msgstr "_Dokumento"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr "Sk_ani"
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "Unuopa _paĝo"
 
 #. 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 "Ĉiuj paĝoj el _papero-metilo"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr "Malantaŭe"
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
-msgstr "Tranĉu"
+msgid "_Stop Scan"
+msgstr "Haltigi _skani"
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr ""
+msgid "Text"
+msgstr "Teksto"
 
-#. Combo box label for scanning the front side of a page
+#. Combo box label for photo scan mode
 #: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr ""
+msgid "Photo"
+msgstr "Foto"
 
-#. Combo box label for scanning both sides of a page
+#. Label on email menu item
 #: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr ""
+msgid "_Email"
+msgstr "R_etpoŝto"
 
-#. Radio button for cropping to page to US legal size
+#. Page menu (contains action for each page, e.g. delete, crop)
 #: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr ""
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr "Nova"
+msgid "_Page"
+msgstr "_Paĝo"
 
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr ""
+#. Menu item to rotate page to left (anti-clockwise)
+#: ../data/simple-scan.ui.h:22
+msgid "Rotate _Left"
+msgstr "Turni _maldekstren"
 
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
-msgid "Photo"
-msgstr "Foto"
+#. Menu item to rotate page to right (clockwise)
+#: ../data/simple-scan.ui.h:24
+msgid "Rotate _Right"
+msgstr "Turni _dekstren"
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr ""
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "Stu_ci"
 
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
-msgstr ""
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "_Neniu"
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr ""
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
 
-#. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
-msgid "Rotate _Left"
-msgstr ""
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
 
-#. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
-msgid "Rotate _Right"
-msgstr ""
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr ""
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "US _Letter"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr ""
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "US Le_gal"
 
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr ""
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr ""
+msgid "_Custom"
+msgstr "_Propre"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr ""
+msgid "_Rotate Crop"
+msgstr "_Rotacii la stoco-lokon"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
-msgstr ""
+msgid "Move Left"
+msgstr "Movi maldekstren"
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr ""
+msgid "Move Right"
+msgstr "Movi dekstren"
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr ""
+msgid "_Help"
+msgstr "_Helpo"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
-msgstr ""
-
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr ""
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr ""
+msgid "_Contents"
+msgstr "_Enhavo"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
-msgstr ""
+msgstr "Komenci novan dokumenton"
 
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "Nova"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "Skani unuopan paĝon el la skanilo"
+
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
-msgstr ""
+msgid "Scan"
+msgstr "Skani"
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
-msgid "Stop the current scan"
-msgstr ""
+msgid "Save document to a file"
+msgstr "Konservi dokumenton en dosiero"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr ""
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "Konservi"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
+msgid "Stop the current scan"
+msgstr "Haltigi la aktualan skanon"
 
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr ""
+msgid "Stop"
+msgstr "Haltigi"
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
-msgstr ""
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Rotacii la paĝon maldekstren (maldekstrume)"
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr ""
+msgid "Rotate Left"
+msgstr "Turni maldekstren"
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr ""
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Rotacci la paĝon dekstren (dekstrume)"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr ""
+msgid "Rotate Right"
+msgstr "Turni dekstren"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "Stuci la elektitan paĝon"
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
-msgstr ""
+msgid "Crop"
+msgstr "Stuci"
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr ""
+msgid "_Username for resource:"
+msgstr "Sal_utnomo por risurco:"
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr ""
+msgid "_Password:"
+msgstr "_Pasvorto:"
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr ""
+msgid "_Authorize"
+msgstr "R_ajtigi"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr ""
+msgid "Preferences"
+msgstr "Agordoj"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr ""
+msgid "Scan S_ource:"
+msgstr "Skano-f_onto:"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
-msgstr ""
+msgid "_Text Resolution:"
+msgstr "_Teksta distingivo"
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr ""
+msgid "_Photo Resolution:"
+msgstr "_Fotaĵa distingivo:"
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
-msgstr ""
+msgid "Scan Side:"
+msgstr "Skano-flanko:"
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
-msgstr ""
+msgid "Page Size:"
+msgstr "Paĝo-grando:"
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
+msgid "Brightness:"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
-msgstr ""
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "Antaŭo kaj malantaŭo"
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
-msgstr ""
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "Antaŭo"
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
-msgstr ""
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "Dorso"
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr ""
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "Skani dokumentojn"
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "Fenestro-larĝo en rastrumeroj"
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "Fenestro-alto en rastrumeroj"
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "VERA se la apliko-fenestro estas maksimumigita"
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "La aparato el kiu skani"
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
-msgstr ""
+msgstr "SANE aparato de kiu akiri bildojn."
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "Speco de dokumento kiu estas skanata"
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
+"La skanota dokumentspeco. Ĉi tiu agordo difinas la skandistingivon, -"
+"kolorojn kaj -posttraktadon."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "Direkto de skani"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "La direkto de la skanilo trans la skanota paĝo"
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "Larĝo de skaninta bildo en rastrumeroj"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
 msgstr ""
+"La larĝo de la skanita bildo en rastrumeroj.  Ĉi tiu valoro estas "
+"ĝisdatigita al tion de la paĝo antaŭa."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "Alto de skaninta bildo en rastrumeroj"
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
 msgstr ""
+"La alto de la skanita bildo en rastrumeroj.  Ĉi tiu valoro estas ĝisdatigita "
+"al tion de la paĝo antaŭa."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "Larĝo de papero en dekonaj millimetroj"
 
-#: ../data/simple-scan.schemas.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
+"La larĝo de la papero en dekonoj de millimetro (aŭ 0 por aŭtomata detekti)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "Alto de Papero en dekonaj millimetroj"
 
-#: ../data/simple-scan.schemas.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
 msgstr ""
+"La alto de la papero en dekonoj de millimetro (aŭ 0 por aŭtomata detekti)."
 
-#: ../data/simple-scan.schemas.in.h:17
-msgid "The resolution in dots-per-inch of the previously scanned image."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:19
-msgid "The resolution in dots-per-inch to use when scanning text."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "Distingivo de bildon skaninta antaŭe"
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
+msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr ""
+"La distingivo en punktoj en coloj de la bildo kiu estis skanita antaŭe."
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "Distingivo por tekstoskanoj"
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "La distingvo en punktoj en coloj uzi kiam skanantaj teksto."
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "Distingivo por fotoskanoj"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "La distingvo en punktoj en coloj uzi kiam skanantaj fotoj."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "Paĝoflankon skani"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "La skanota paĝoflanko"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "Dosierujo al kiu konservi"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
+"La dosierujo al kiu konservi dosierojn.  La dokumentoj dosierujo estas la "
+"defaŭlto, se malagordi."
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
-msgstr ""
+msgstr "Neniuj skaniloj disponeblaj.  Bonvolu konekti skanilon."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
-msgstr ""
+msgstr "Ne povas konekto kun skanilo"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
-msgstr ""
+msgstr "Ne povas komenci skani"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
-msgstr ""
+msgstr "Eraro kiam konektanta kun skanilo"
+
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Montri eldonversion"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Presi mesaĝojn pri sencimigo"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr "Ripari PDF-dosierojn generitajn per antaŭaj versioj de Simple Scan"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
-msgstr ""
+msgstr "Ne sukcesi skani"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
-msgstr ""
+msgstr "Skanita Dokumento"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
-msgstr ""
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[APARATO...] - Skanutilaĵo"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
+msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
+"Lanĉu '%s --help' por vidi plenan liston da disponeblaj komandliniaj opcioj."
 
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
-#, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
-msgstr ""
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "Skanita Dokumento.pdf"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
-msgstr ""
+msgstr "Salutnomo kaj pasvorto estas necesa aliri '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
-msgstr ""
+msgstr "Neniuj skaniloj eltrovis"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
-msgstr ""
-
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr ""
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr ""
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr ""
+msgstr "Bonvolu kontrolas ke via skanilo estas kenekta kaj kurentŝalta"
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
-msgstr ""
+msgstr "Konservi kiel..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
-msgstr ""
+msgstr "Bildo-dosieroj"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
-msgstr ""
+msgstr "Ĉiuj dosieroj"
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
-msgstr ""
+msgstr "Elekti speco de dosieron"
+
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF (multpaĝa dokumento)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (densigita)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (senperda)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
-msgstr ""
+msgstr "Ne sukcesis konservi la dosieron"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
-msgstr ""
+msgstr "Se vi ne konservas, ŝanĝoj estos perditaj permanente."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
-msgstr ""
+msgstr "Konservi la nunan dokumenton?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
-msgstr ""
+msgstr "Forlasi Ŝanĝojn"
+
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "Ne eblas konservi bildon por antaŭrigardo"
 
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
-msgstr ""
+msgstr "Ne eblis malfermi bild-dosieron"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
-msgstr ""
+msgstr "Ne eblis malfermi help-dosieron"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -551,77 +608,198 @@ msgid ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
+"Ĉi tiu verko estas libera programo; vi povas ĝin pludistribui kaj/aŭ modifi\n"
+"je la  kondiĉoj  de la  GNUa Ĝenerala Publika Permesilo, eldonita de\n"
+"Free Software  Foundation, laŭ versio 3  de tiu Permesilo aŭ,\n"
+"se vi preferas, ajna posta versio.\n"
+"\n"
+"Ni  distribuas   ĉi  tiun  programon esperante  ke ĝi estos  utila,\n"
+"tamen SEN  IA AJN  GARANTIO,  i.a. sen  la implica garantio pri\n"
+"SURMERKATIGEBLO aŭ  TAŬGECO  POR  IU KONKRETA  CELO.  Pliajn  detalojn  vidu "
+"en la GNUa Ĝenerala Publika Permesilo.\n"
+"\n"
+"Ekzemplero de la GNUa Ĝenerala Publika Permesilo devas esti liverita\n"
+"al vi kun ĉi tiu programo; se vi ĝin ne ricevis, turnu vin al "
+"<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
-msgstr ""
+msgstr "Pri simpla skani"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
-msgstr ""
+msgstr "Simpla ilo por skanantaj dokumentoj"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Leo Arias https://launchpad.net/~elopio"
+"  Donald Rogers https://launchpad.net/~dero9753\n"
+"  Kristjan SCHMIDT https://launchpad.net/~kristjan-eo\n"
+"  Leo Arias https://launchpad.net/~elopio\n"
+"  Michael Moroni https://launchpad.net/~airon90\n"
+"  Patrick (Petriko) Oudejans https://launchpad.net/~patrickoudejans\n"
+"  Robert Ancell https://launchpad.net/~robert-ancell\n"
+"  Tiffany Antopolski https://launchpad.net/~mimico-tiffany"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
-msgstr ""
+msgstr "Konservi dokumenton antaŭe ĉesanta?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
-msgstr ""
+msgstr "Fini sen konservanta"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
 #, c-format
-msgid "%d dpi (draft)"
-msgstr ""
+msgid "%d dpi (default)"
+msgstr "%d punktoj en colo (defaŭlto)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1292
 #, c-format
-msgid "%d dpi"
-msgstr ""
+msgid "%d dpi (draft)"
+msgstr "%d punktoj en colo (malneto)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
-msgstr ""
+msgstr "%d punktoj en colo (alta distingivo)"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
-msgstr ""
+msgid "%d dpi"
+msgstr "%d punktoj en colo"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
-msgstr ""
+msgstr "Dosieroj estas perdiĝantoj"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
-msgstr ""
+msgstr "Bonvolu kontroli vian instalaĵon"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
-msgstr ""
+msgstr "Ŝanĝi _Skanilo"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
+msgstr "Aŭtomata"
+
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
 msgstr ""
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr ""
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr ""
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr ""
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr ""
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
 msgstr ""
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "Konservado de dokumento..."
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "Konservado de paĝo %d el %d"
+
+#~ msgid ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ msgstr ""
+#~ "La direkto de la skanilo trans la skanita paĝo. Ĝi povi esti: 'supre-"
+#~ "malsupren' 'malsupre-supren' 'maldekstre-dekstre' 'dekstre-maldekstren'"
+
+#~ msgid ""
+#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ msgstr ""
+#~ "La flanko de paĝo skani.  Povas esti unu el ĉi tiuj: 'ambaŭ' 'antaŭa' "
+#~ "'malantaŭa'"
+
+#~ msgid ""
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
+#~ msgstr ""
+#~ "Speco de dokumento estas skanata. 'teksto' por tekstoj dokumentoj, 'bildo' "
+#~ "por bildoj.  Ĉi tio agordo decidas pri la distingvo, koloroj kaj "
+#~ "posttraktanta."
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "Uzo:\n"
+#~ "  %s [APARATO...] - Skananta ilo"
+
+#, c-format
+#~ msgid ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+#~ msgstr ""
+#~ "Helpa Opcioj:\n"
+#~ "  -d, --debug                     Presi sencimigaj mesaĝoj\n"
+#~ "  -v, --version                   Montri eldonversio\n"
+#~ "  -h, --help                      Montri helpajn opciojn\n"
+#~ "  --help-all                      Montri ĉiujn helpajn opciojn"
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "GTK+ Opcioj:\n"
+#~ "  --class=KLASO                   Programo-klaso kiel estas uzita de la "
+#~ "fenestro administrilo\n"
+#~ "  --name=NOMO                     Programo-nomo kiel estas uzita de la "
+#~ "fenestro administrilo\n"
+#~ "  --screen=EKRANO                 X ekarano uzi\n"
+#~ "  --sync                          Fari X  pasigoj sinkrona (sinkronigi)\n"
+#~ "  --gtk-module=MODULAJ            Ŝargi suplementaj GTK+ moduloj\n"
+#~ "  --g-fatal-warnings              Fari ĉiujn avertojn neripareblaj"
diff --git a/po/es.po b/po/es.po
index 7f3c0d3..c8970f8 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,326 +7,347 @@ msgid ""
 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-10-21 16:34+0000\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-07-23 08:59+0000\n"
 "Last-Translator: Monkey <monkey.libre@gmail.com>\n"
 "Language-Team: Spanish <es@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-10-22 04:48+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Simple Scan"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr "A_4"
+msgid "_Document"
+msgstr "_Documento"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr "Esc_anear"
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "_Una página"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:10
 msgid "All Pages From _Feeder"
 msgstr "Todas las páginas del _alimentador"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr "Atrás"
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
-msgstr "Recortar"
+msgid "_Stop Scan"
+msgstr "D_etener escaneado"
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr "Recortar la página seleccionada"
+msgid "Text"
+msgstr "Texto"
 
-#. Combo box label for scanning the front side of a page
+#. Combo box label for photo scan mode
 #: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr "Anverso"
+msgid "Photo"
+msgstr "Foto"
 
-#. Combo box label for scanning both sides of a page
+#. Label on email menu item
 #: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr "Anverso y reverso"
+msgid "_Email"
+msgstr "_Correo"
 
-#. Radio button for cropping to page to US legal size
+#. Page menu (contains action for each page, e.g. delete, crop)
 #: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr "Le_gal"
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr "Nuevo"
+msgid "_Page"
+msgstr "_Página"
 
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr "Tamaño de página:"
+#. Menu item to rotate page to left (anti-clockwise)
+#: ../data/simple-scan.ui.h:22
+msgid "Rotate _Left"
+msgstr "Girar a la i_zquierda"
 
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
-msgid "Photo"
-msgstr "Fotografía"
+#. Menu item to rotate page to right (clockwise)
+#: ../data/simple-scan.ui.h:24
+msgid "Rotate _Right"
+msgstr "Girar a la _derecha"
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr "Preferencias"
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "_Recortar"
 
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
-msgstr "Rotar a la izquierda"
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "_Ninguno"
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr "Rotar a la derecha"
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
 
-#. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
-msgid "Rotate _Left"
-msgstr "Rotar a la _izquierda"
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
 
-#. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
-msgid "Rotate _Right"
-msgstr "Rotar a la _derecha"
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Rotar la página a la izquierda (contrario a las agujas del reloj)"
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "_Carta"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Rotar la página a la derecha (sentido de las agujas del reloj)"
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "_Oficio"
 
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr "Guardar"
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr "Guardar documento en un archivo"
+msgid "_Custom"
+msgstr "_Personalizado"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr "Esc_anear"
+msgid "_Rotate Crop"
+msgstr "_Girar recorte"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
-msgstr "Escanear"
+msgid "Move Left"
+msgstr "Mover a la izquierda"
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr "_Origen de escaneo:"
+msgid "Move Right"
+msgstr "Mover a la derecha"
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr "Cara a escanear:"
+msgid "_Help"
+msgstr "Ay_uda"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
-msgstr "Escanear una sola página desde el escaner"
-
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr "Simple Scan"
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr "_Una página"
+msgid "_Contents"
+msgstr "_Contenidos"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
 msgstr "Crear un documento nuevo"
 
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "Nuevo"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "Escanear una sola página desde el escáner"
+
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
-msgstr "Parar"
+msgid "Scan"
+msgstr "Escanear"
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
-msgid "Stop the current scan"
-msgstr "Para el escaneado actual"
+msgid "Save document to a file"
+msgstr "Guardar documento a un archivo"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr "Texto"
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "Guardar"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
+msgid "Stop the current scan"
+msgstr "Detiene el escaneado actual"
 
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr "_Autorizar"
+msgid "Stop"
+msgstr "Detener"
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
-msgstr "_Contenidos"
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Girar la página a la izquierda (contrario a las agujas del reloj)"
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr "_Recortar"
+msgid "Rotate Left"
+msgstr "Girar a la izquierda"
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr "_Personalizado"
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Girar la página a la derecha (sentido de las agujas del reloj)"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr "_Documento"
+msgid "Rotate Right"
+msgstr "Girar a la derecha"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "Recortar la página seleccionada"
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
-msgstr "_Correo"
+msgid "Crop"
+msgstr "Recortar"
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr "Ay_uda"
+msgid "_Username for resource:"
+msgstr "Nombre de _usuario para el recurso:"
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr "_Carta"
+msgid "_Password:"
+msgstr "_Contraseña:"
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr "_Ninguno"
+msgid "_Authorize"
+msgstr "_Autorizar"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr "_Página"
+msgid "Preferences"
+msgstr "Preferencias"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr "_Contraseña:"
+msgid "Scan S_ource:"
+msgstr "_Origen de escaneo:"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
-msgstr "Resolución de _fotografía:"
+msgid "_Text Resolution:"
+msgstr "Resolución de _texto:"
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr "_Rotar recorte"
+msgid "_Photo Resolution:"
+msgstr "Resolución de _fotografía:"
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
-msgstr "_Parar de escanear"
+msgid "Scan Side:"
+msgstr "Cara a escanear:"
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
-msgstr "Resolución de _texto:"
+msgid "Page Size:"
+msgstr "Tamaño de página:"
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
-msgstr "Nombre de _usuario para el recurso"
+msgid "Brightness:"
+msgstr "Brillo:"
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
-msgstr "Escanear documentos"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr "Contraste:"
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
-msgstr "Para escanear desde el dispositivo"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr "Calidad:"
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
-msgstr "Dirección de escaneo"
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "Anverso y reverso"
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
-msgstr "Directorio en el que guardar los archivos"
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "Anverso"
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
-msgstr "Altura del papel en décimas de mm"
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "Atrás"
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr "Altura de la imagen escaneada en píxeles"
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "Escanear documentos"
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
-msgstr "Cara a escanear de la página"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "Anchura de la ventana en píxeles"
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
-msgstr "Resolución para los escaneados de fotografías"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "Altura de la ventana en píxeles"
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
-msgstr "Resolución para los escaneados de texto"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "VERDADERO si la ventana de la aplicación está maximizada"
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
-msgstr "Resolución de la última imagen escaneada"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "Para escanear desde el dispositivo"
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
 msgstr "Dispositivo SANE desde donde adquirir las imágenes."
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
-msgstr "VERDADERO si la ventana de la aplicación está maximizada"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "Tipo de documento que está siendo escaneado"
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
-"La dirección del escáner a través de la página escaneada. Puede ser "
-"cualquiera de los siguientes: 'top-to-bottom' 'bottom-to-top' 'left-to-"
-"right' 'right-to-left'"
+"Tipo de documento escaneándose. Esta configuración establece la resolución "
+"de escaneo, colores y post-procesamiento."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "Dirección de escaneo"
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "La dirección del escáner a través de la página escaneada."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "Anchura de la imagen escaneada"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
 msgstr ""
-"El directorio en el que se guardarán los archivos. Por defecto será el "
-"directorio de documentos."
+"La anchura de la imagen escaneada. Este valor se actualiza con el que tuvo "
+"la última página escaneada"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "Altura de la imagen escaneada en píxeles"
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
@@ -334,245 +355,247 @@ msgstr ""
 "La altura de la imagen escaneada. Este valor se actualiza con el que tuvo la "
 "última página escaneada"
 
-#: ../data/simple-scan.schemas.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "Anchura del papel en décimas de mm"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
-"La altura del papel en décimas de mm (0 para detección automática del papel)."
+"La anchura del papel en décimas de mm (0 para detección automática del "
+"papel)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "Altura del papel en décimas de mm"
 
-#: ../data/simple-scan.schemas.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
 msgstr ""
-"La cara a escanear de la página. Puede ser uno de los siguientes: «ambas», "
-"«anverso» o «reverso»."
+"La altura del papel en décimas de mm (0 para detección automática del papel)."
 
-#: ../data/simple-scan.schemas.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr "Brillo de escaneo"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Ajuste del brillo desde -100 a 100 (siendo 0 sin ajuste)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr "Contraste del escaneo"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Ajuste de contraste desde -100 a 100 (siendo 0 sin ajuste)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "Resolución de la última imagen escaneada"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
 msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr ""
 "La resolución en puntos por pulgada de la imagen escaneada anteriormente."
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "La resolución en puntos por pulgada a usar al escanear fotografías."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "Resolución para los escaneados de texto"
 
-#: ../data/simple-scan.schemas.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "La resolución en puntos por pulgada a usar al escanear texto."
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"La anchura de la imagen escaneada. Este valor se actualiza con el que tuvo "
-"la última página escaneada"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "Resolución para los escaneados de fotografías"
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"La anchura del papel en décimas de mm (0 para detección automática del "
-"papel)."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "La resolución en puntos por pulgada a usar al escanear fotografías."
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
-msgstr "Tipo de documento que está siendo escaneado"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "Cara a escanear de la página"
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
-msgstr ""
-"Tipo del documento que va a ser escaneado. «Texto» para documentos de texto, "
-"«Fotografía» para fotografías. Esta opción determina la resolución, los "
-"colores y el post-procesamiento del escaneado."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "El lado de la página a escanear."
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
-msgstr "Anchura del papel en décimas de mm"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "Directorio en el que guardar los archivos"
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
-msgstr "Anchura de la imagen escaneada"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"El directorio en el que se guardarán los archivos. Por defecto será el "
+"directorio de documentos."
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
-msgstr "Altura de la ventana en píxeles"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr "Calidad de la compresión de JPEG"
 
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
-msgstr "Anchura de la ventana en píxeles"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr "Calidad de la compresión de JPEG."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
 msgstr "No hay escáneres disponibles. Conecte un escáner."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
 msgstr "No se pudo conectar al escáner"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
-msgstr "No empezar a escanear"
+msgstr "Incapaz de iniciar el escaneo"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
 msgstr "Error comunicándose con el escáner"
 
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Mostrar el número de versión"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Mostrar mensajes de depuración"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+"Arreglar archivos PDF generados con versiones anteriores de Simple Scan"
+
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
 msgstr "Falló al escanear"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
 msgstr "Documento escaneado"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
-msgstr ""
-"Uso:\n"
-"  %s [DISPOSITIVO...] - utilidad de escaneo"
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[DEVICE...] - Utilidad de escaneo"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
-msgstr ""
-"Opciones de ayuda:\n"
-"  -d, --debug                     Muestra mensajes de depuración\n"
-"  -v, --version                   Muestra la versión\n"
-"  -h, --help                      Muestra opciones de ayuda\n"
-"  --help-all                      Muestra todas las opciones de ayuda\n"
-"  --help-gtk                      Muestra opciones de GTK+"
-
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
-#, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
+msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
-"Opciones de GTK+:\n"
-"  --class=CLASE                   Clase de programa como se usa por el "
-"gestor de ventanas\n"
-"  --name=NOMBRE                   Nombre del programa como se usa por el "
-"gestor de ventanas\n"
-"  --screen=PANTALLA               Pantalla X que usar\n"
-"  --sync                          Hacer que las llamadas las X sean "
-"síncronas\n"
-"  --gtk-module=MÓDULOS            Cargar módulos GTK+ adicionales\n"
-"  --g-fatal-warnings              Hacer que todos los avisos sean fatales"
+"Ejecute «%s --help» para ver una lista completa de las opciones de línea de "
+"órdenes disponibles."
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "Documento.pdf escaneado"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Usuario y contraseña necesarios para acceder a «%s»"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
-msgstr "Ningún escáner detectado"
+msgstr "No se detectó ningún escáner"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
 msgstr "Compruebe que su escáner está encendido y conectado"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr "PDF (documento multipágina)"
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr "JPEG (comprimido)"
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr "PNG (sin pérdida)"
-
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
-msgstr "Guardar como..."
+msgstr "Guardar como…"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
 msgstr "Archivos de imagen"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
 msgstr "Todos los archivos"
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
 msgstr "Seleccione el _tipo de archivo"
 
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF (documento multipágina)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (comprimido)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (sin pérdida)"
+
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
 msgstr "Falló al guardar el archivo"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Los cambios se perderán permanentemente si no los guarda."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
 msgstr "¿Guardar el documento actual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
 msgstr "Descartar cambios"
 
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "No se pudo guardar la imagen para previsualización"
+
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
-msgstr "No se puede abrir la imagen previa de la aplicación"
+msgstr "No se puede abrir la aplicación de previsualización de imágenes"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
 msgstr "No se pudo abrir el archivo de ayuda"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -588,45 +611,46 @@ msgid ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 "Este programa es software libre: puede redistribuirlo o modificarlo\n"
-"en los términos de la GNU General Public License publicada por la\n"
+"en los términos de la Licencia Pública General de GNU publicada por la\n"
 "Free Software Foundation, en su versión 3 o, a su elección, cualquiera\n"
 "posterior.\n"
 "\n"
 "Este programa se distribuye con la esperanza de que sea útil,\n"
-"pero SIN NINGUNA GARANTíA; ni tan siquiera la garantía implícita de\n"
+"pero SIN NINGUNA GARANTÍA; ni siquiera la garantía implícita de\n"
 "COMERCIABILIDAD o ADECUACIÓN A UN OBJETIVO PARTICULAR. Vea la\n"
-"GNU General Public License para más detalles.\n"
+"Licencia Pública General de GNU para más detalles.\n"
 "\n"
-"Debe haber recibido una copia de la GNU General Public License\n"
+"Debe haber recibido una copia de la Licencia Pública General de GNU\n"
 "con este programa. Si no fuera así, vea <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
 msgstr "Acerca de Simple Scan"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
 msgstr "Herramienta sencilla para escanear documentos"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  A. Emmanuel Mendoza https://launchpad.net/~a.emmanuelmendoza\n"
+"  Adolfo Jayme Barrientos https://launchpad.net/~fitoschido\n"
 "  Antonio Sánchez https://launchpad.net/~antoniosanchez\n"
 "  Carlos Alberto Ospina https://launchpad.net/~atah\n"
-"  Carlos Martín Nieto https://launchpad.net/~cmn\n"
 "  Dante Díaz https://launchpad.net/~dante\n"
 "  DiegoJ https://launchpad.net/~diegojromerolopez\n"
 "  Edgardo Fredz https://launchpad.net/~edgardo-fredz\n"
 "  FAMM https://launchpad.net/~famm94\n"
 "  Genesis Bustamante https://launchpad.net/~genmarc\n"
-"  Hector Louzao https://launchpad.net/~hhlp\n"
+"  Guillermo RP https://launchpad.net/~guille-arp\n"
 "  Jonay https://launchpad.net/~jonay-santana\n"
+"  Jose Luis Tirado https://launchpad.net/~txelu70\n"
 "  José Luis Ricón https://launchpad.net/~artirj\n"
-"  Julián Alarcón https://launchpad.net/~alarconj\n"
+"  Julian Alarcon https://launchpad.net/~alarconj\n"
 "  Martin Albisetti https://launchpad.net/~beuno\n"
 "  Monkey https://launchpad.net/~monkey-libre\n"
 "  Paco Molinero https://launchpad.net/~franciscomol\n"
@@ -637,62 +661,169 @@ msgstr ""
 "  daironmedina https://launchpad.net/~dairon\n"
 "  elXATU https://launchpad.net/~elxatu\n"
 "  felix.anadon@gmail.com https://launchpad.net/~felix-anadon\n"
-"  fosk https://launchpad.net/~oscarrdg"
+"  fosk https://launchpad.net/~oscarrdg\n"
+"  hhlp https://launchpad.net/~hhlp-deactivatedaccount\n"
+"  serrador https://launchpad.net/~fserrador"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
 msgstr "¿Guardar el documento antes de salir?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
 msgstr "Salir sin guardar"
 
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d ppp (predeterminado)"
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#: ../src/ui.vala:1292
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (borrador)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
-#, c-format
-msgid "%d dpi"
-msgstr "%d ppp"
-
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d ppp (alta resolución)"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
-msgstr "%d ppp (predeterminado)"
+msgid "%d dpi"
+msgstr "%d ppp"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
 msgstr "Faltan archivos"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
 msgstr "Verifique su instalación"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
 msgstr "Cambiar _escáner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
-msgstr "Documento escaneado.pdf"
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr "Más oscuro"
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr "Más claro"
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr "Menos"
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr "Más"
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr "Mínima"
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr "Máxima"
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "Guardando el documento…"
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "Guardando la página %d de %d"
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "Opciones de GTK+:\n"
+#~ "  --class=CLASE                   Clase de programa como se usa por el "
+#~ "gestor de ventanas\n"
+#~ "  --name=NOMBRE                   Nombre del programa como se usa por el "
+#~ "gestor de ventanas\n"
+#~ "  --screen=PANTALLA               Pantalla X que usar\n"
+#~ "  --sync                          Hacer que las llamadas las X sean "
+#~ "síncronas\n"
+#~ "  --gtk-module=MÓDULOS            Cargar módulos GTK+ adicionales\n"
+#~ "  --g-fatal-warnings              Hacer que todos los avisos sean fatales"
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "Uso:\n"
+#~ "  %s [DISPOSITIVO...] - utilidad de escaneo"
+
+#~ msgid ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ msgstr ""
+#~ "La dirección del escáner a través de la página escaneada. Puede ser "
+#~ "cualquiera de los siguientes: 'top-to-bottom' 'bottom-to-top' 'left-to-"
+#~ "right' 'right-to-left'"
+
+#, c-format
+#~ msgid ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+#~ msgstr ""
+#~ "Opciones de ayuda:\n"
+#~ "  -d, --debug                     Muestra mensajes de depuración\n"
+#~ "  -v, --version                   Muestra la versión\n"
+#~ "  -h, --help                      Muestra opciones de ayuda\n"
+#~ "  --help-all                      Muestra todas las opciones de ayuda\n"
+#~ "  --help-gtk                      Muestra opciones de GTK+"
+
+#~ msgid ""
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
+#~ msgstr ""
+#~ "Tipo del documento que va a ser escaneado. «Texto» para documentos de texto, "
+#~ "«Fotografía» para fotografías. Esta opción determina la resolución, los "
+#~ "colores y el post-procesamiento del escaneado."
+
+#~ msgid ""
+#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ msgstr ""
+#~ "La cara a escanear de la página. Puede ser uno de los siguientes: «ambas», "
+#~ "«anverso» o «reverso»."
diff --git a/po/et.po b/po/et.po
index 060eb80..cd008cb 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,326 +7,345 @@ msgid ""
 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-03-16 07:52+0000\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-07-23 08:59+0000\n"
 "Last-Translator: mahfiaz <mahfiaz@gmail.com>\n"
 "Language-Team: Estonian <et@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-10-22 04:47+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:44+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4 x 6 tolli"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Lihtne skannija"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr "A_4"
+msgid "_Document"
+msgstr "_Dokument"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr "Sk_annimine"
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "Üks _lehekülg"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:10
 msgid "All Pages From _Feeder"
 msgstr "Kõik lehed _söötjast"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr ""
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
-msgstr "Kärbi"
+msgid "_Stop Scan"
+msgstr "_Lõpeta skannimine"
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr "Valitud lehekülje kärpimine"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr ""
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr ""
-
-#. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr ""
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr "Uus"
-
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr ""
+msgid "Text"
+msgstr "Tekst"
 
 #. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
+#: ../data/simple-scan.ui.h:16
 msgid "Photo"
 msgstr "Foto"
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr "Eelistused"
-
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
-msgstr "Vasakule pööramine"
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr "_E-post"
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr "Paremale pööramine"
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr "_Lehekülg"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
+#: ../data/simple-scan.ui.h:22
 msgid "Rotate _Left"
 msgstr "Pööra _vasakule"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
+#: ../data/simple-scan.ui.h:24
 msgid "Rotate _Right"
 msgstr "Pööra _paremale"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Lehekülje pööramine vasakule (vastupäeva)"
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "_Kärbi"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Lehekülje pööramine paremale (päripäeva)"
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "_Puudub"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
 
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "_Letter"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "US _Legal"
+
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr "Salvesta"
+msgid "4&#xD7;6"
+msgstr "4 x 6 tolli"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr ""
+msgid "_Custom"
+msgstr "_Kohandatud"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr "Sk_annimine"
+msgid "_Rotate Crop"
+msgstr "_Pööramisega kärbe"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
-msgstr "Skaneeri"
+msgid "Move Left"
+msgstr ""
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr "Skannimise _allikas:"
+msgid "Move Right"
+msgstr ""
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr ""
+msgid "_Help"
+msgstr "A_bi"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
-msgstr "Ühe lehekülje skannimine skannerist"
-
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr "Lihtne skannija"
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr "Üks _lehekülg"
+msgid "_Contents"
+msgstr "_Sisu"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
 msgstr "Uue dokumendi alustamine"
 
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "Uus"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "Ühe lehekülje skannimine skannerist"
+
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
-msgstr "Lõpeta"
+msgid "Scan"
+msgstr "Skanni"
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr "Dokumendi salvestamine faili"
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "Salvesta"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
 msgid "Stop the current scan"
 msgstr "Selle skannimise lõpetamine"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr "Tekst"
-
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr "_Autoriseeri"
+msgid "Stop"
+msgstr "Lõpeta"
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
-msgstr "_Sisu"
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Lehekülje pööramine vasakule (vastupäeva)"
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr "_Kärbi"
+msgid "Rotate Left"
+msgstr "Vasakule pööramine"
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr "_Kohandatud"
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Lehekülje pööramine paremale (päripäeva)"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr "_Dokument"
+msgid "Rotate Right"
+msgstr "Paremale pööramine"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "Valitud lehekülje kärpimine"
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
-msgstr "_E-post"
+msgid "Crop"
+msgstr "Kärbi"
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr "A_bi"
+msgid "_Username for resource:"
+msgstr "_Kasutajanimi allika jaoks:"
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr "_Letter"
+msgid "_Password:"
+msgstr "_Parool:"
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr "_Puudub"
+msgid "_Authorize"
+msgstr "_Autoriseeri"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr "_Lehekülg"
+msgid "Preferences"
+msgstr "Eelistused"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr "_Parool:"
+msgid "Scan S_ource:"
+msgstr "Skannimise _allikas:"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
-msgstr "_Foto eraldusvõime:"
+msgid "_Text Resolution:"
+msgstr "_Teksti eraldusvõime:"
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr "_Pööramisega kärbe"
+msgid "_Photo Resolution:"
+msgstr "_Foto eraldusvõime:"
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
-msgstr "_Lõpeta skannimine"
+msgid "Scan Side:"
+msgstr "Slaidi skannimine:"
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
-msgstr "_Teksti eraldusvõime:"
+msgid "Page Size:"
+msgstr "Lehekülje suurus:"
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
-msgstr "_Kasutajanimi allika jaoks:"
+msgid "Brightness:"
+msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
-msgstr "Dokumentide skannimine"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
-msgstr "Seade, millest skannida"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
-msgstr "Skannimise suund"
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "Esi- ja tagakülg"
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
-msgstr "Kataloog, kuhu failid salvestada"
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "Esikülg"
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
-msgstr ""
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "Tagakülg"
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr "Skannitud piltide kõrgus pikslites"
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "Dokumentide skannimine"
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "Akna laius pikslites"
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
-msgstr "Fotoskannide eraldusvõime"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "Akna kõrgus pikslites"
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
-msgstr "Tekstiskannide eraldusvõime"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "Tõene, kui rakenduse aken on maksimeeritud"
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
-msgstr "Viimase skannitud pildi eraldusvõime"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "Seade, millest skannida"
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
 msgstr "SANE-seade, millest pilte hankida."
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
-msgstr "Tõene, kui rakenduse aken on maksimeeritud"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "Skannitava dokumenti tüüp"
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "Skannimise suund"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
 msgstr ""
-"Skanneeritava lehe suund skanneris. See võib olla üks järgnevaist: 'top-to-"
-"bottom' (ülalt alla), 'bottom-to-top' (alt üles), 'left-to-right' (vasakult "
-"paremale), 'right-to-left' (paremalt vasakule)."
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "Skannitud pildi laius pikslites"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
 msgstr ""
-"Kataloog, kuhu failid salvestada. Kui määramata, on vaikeväärtus dokumentide "
-"kataloog."
+"Skannitud piltide laius pikslites. Väärtust uuendatakse vastavalt viimati "
+"skannitud lehele."
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "Skannitud piltide kõrgus pikslites"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
@@ -334,236 +353,241 @@ msgstr ""
 "Skannitud pildi kõrgus pikslites. Seda väärtust uuendatakse vastavalt "
 "viimati skannitud lehele."
 
-#: ../data/simple-scan.schemas.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "Paberi laius kümnendikmillimeetrites"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr "Paberi laius kümnendikmillimeetrites (automaatseks tuvastuseks 0)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "Paberi kõrgus kümnendikmillimeetrites"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
+"Paberi kõrgus kümnendikmillimeetrites (paberi automaatseks tuvastamiseks 0)."
 
-#: ../data/simple-scan.schemas.in.h:16
-msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "Viimase skannitud pildi eraldusvõime"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
 msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr "Viimati skannitud pildi eraldusvõime, ühik on punkti tolli kohta."
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "Piltide skannimisel kasutatav lahutus, punktides tolli kohta."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "Tekstiskannide eraldusvõime"
 
-#: ../data/simple-scan.schemas.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "Teksti skannimisel kasutatav lahutus, punktides tolli kohta."
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"Skannitud piltide laius pikslites. Väärtust uuendatakse vastavalt viimati "
-"skannitud lehele."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "Fotoskannide eraldusvõime"
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "Piltide skannimisel kasutatav lahutus, punktides tolli kohta."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "Skannitav lehe külg"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
-msgstr "Skannitava dokumenti tüüp"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "Kataloog, kuhu failid salvestada"
 
-#: ../data/simple-scan.schemas.in.h:23
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
 msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
+"The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
-"Skannitava dokumendi tüüp. 'Tekst' on tekstidokumentide jaoks, 'foto' on "
-"fotode jaoks. See säte määrab skannimise eraldusvõime, värvid ja "
-"järeltöötluse."
+"Kataloog, kuhu failid salvestada. Kui määramata, on vaikeväärtus dokumentide "
+"kataloog."
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
-msgstr "Skannitud pildi laius pikslites"
-
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
-msgstr "Akna kõrgus pikslites"
-
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
-msgstr "Akna laius pikslites"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Skannereid pole saadaval. Palun ühenda skanner arvutiga."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
 msgstr "Skanneriga ei suudetud ühenduda"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
 msgstr "Skannimist ei suudetud alustada"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
 msgstr "Tõrge skanneriga suhtlemisel"
 
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Versiooninumbri näitamine"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Näita veasilumise sõnumeid"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
 msgstr "Skannimine nurjus"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
 msgstr "Skannitud dokument"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
 msgstr ""
-"Kasutus:\n"
-"  %s [SEADE...] - Skannimise vahend"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
-#, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
-msgstr ""
-"Abi valikud:\n"
-"  -d, --debug                     Silumisteadete printimine\n"
-"  -v, --version                   Versiooni kuvamine\n"
-"  -h, --help                      Abi valikute kuvamine\n"
-"  --help-all                      Kõigi abi valikute kuvamine\n"
-"  --help-gtk                      GTK+ valikute kuvamine"
-
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
-msgstr ""
-"GTK+ võtmed:\n"
-"  --class=KLASS             Aknahalduri poolt kasutatav programmi klass\n"
-"  --name=NIMI               Aknahalduri poolt kasutatav programmi nimi\n"
-"  --screen=EKRAAN           Kasutatav X'i ekraan\n"
-"  --sync                    X'i kutsungid sünkroonseks\n"
-"  --gtk-module=MOODULID     Täiendavate GTK+ moodulite laadimine\n"
-"  --g-fatal-warnings        Kõikide hoiatuste muutmine saatuslikuks"
+msgid "Run '%s --help' to see a full list of available command line options."
+msgstr "Käivita '%s --help', et näha kõiki käsurea valikuid."
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "Skannitud dokument.pdf"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "'%s' ligipääsuks on vajalik kasutajanimi ja parool"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
 msgstr "Ühtegi skannerit ei tuvastatud"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
 msgstr "Kontrolli, kas skanner on ühendatud ja sisse lülitatud"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr "PDF (mitmeleheküljeline dokument)"
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr "JPEG (tihendatud)"
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr "PNG (kadudeta)"
-
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
 msgstr "Salvesta kui..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
 msgstr "Pildifailid"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
 msgstr "Kõik failid"
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
 msgstr "Vali faili _tüüp"
 
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF (mitmeleheküljeline dokument)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (tihendatud)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (kadudeta)"
+
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
 msgstr "Faili salvestamine nurjus"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
-msgstr ""
+msgstr "Kui sa ei salvesta, lähevad muudatused jäädavalt kaotsi."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
-msgstr ""
+msgstr "Kas salvestada see dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
-msgstr ""
+msgstr "Tühista muudatused"
+
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "Eelvaate pildi salvestamine ebaõnnestus"
 
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
 msgstr "Pildi eelvaatluse rakendust ei suudetud käivitada"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
 msgstr "Abiteabe faili pole võimalik avada"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -578,77 +602,194 @@ msgid ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
+"See programm on vaba tarkvara. Te võite seda edasi levitada ja/või muuta "
+"vastavalt GNU Üldise Avaliku Litsentsi tingimustele, nagu need on Vaba "
+"Tarkvara Fondi poolt avaldatud; kas Litsentsi versioon number 3 või "
+"(vastavalt Teie valikule) ükskõik milline hilisem versioon.\n"
+"\n"
+"Seda programmi levitatakse lootuses, et see on kasulik, kuid ILMA IGASUGUSE "
+"GARANTIITA; isegi KESKMISE/TAVALISE KVALITEEDI GARANTIITA või SOBIVUSELE "
+"TEATUD KINDLAKS EESMÄRGIKS. Üksikasjade suhtes vaata GNU Üldist Avalikku "
+"Litsentsi.\n"
+"\n"
+"Koos Nautilusega oleks sa pidanud saama ka koopia GNU Üldisest Avalikust "
+"Litsentsist; juhul kui sa seda ei saanud, siis vaata "
+"<http://www.gnu.org/licences/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
 msgstr "Lihtsast skannijast lähemalt"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
 msgstr "Lihtne dokumendi skaneerimise tööriist"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
+"  Jalakas https://launchpad.net/~jalakas\n"
+"  Madis Veskimeister https://launchpad.net/~avalikarvamus\n"
 "  mahfiaz https://launchpad.net/~mahfiaz"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
-msgstr ""
+msgstr "Kas salvestada dokument enne väljumist?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
-msgstr ""
+msgstr "Välju ilma salvestamata"
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (vaikimisi)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#: ../src/ui.vala:1292
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (mustand)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
-#, c-format
-msgid "%d dpi"
-msgstr "%d dpi"
-
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (kõrge kvaliteet)"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
-msgstr "%d dpi (vaikimisi)"
+msgid "%d dpi"
+msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
 msgstr "Puuduvad failid"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
 msgstr "Palun kontrolli paigaldust"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
 msgstr "_Skanneri vahetamine"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
+msgstr "Automaatne"
+
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
 msgstr ""
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
-msgstr "Skannitud dokument.pdf"
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr ""
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr ""
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr ""
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr ""
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr ""
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "Dokumendi salvestamine..."
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr ""
+
+#~ msgid ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ msgstr ""
+#~ "Skanneeritava lehe suund skanneris. See võib olla üks järgnevaist: 'top-to-"
+#~ "bottom' (ülalt alla), 'bottom-to-top' (alt üles), 'left-to-right' (vasakult "
+#~ "paremale), 'right-to-left' (paremalt vasakule)."
+
+#~ msgid ""
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
+#~ msgstr ""
+#~ "Skannitava dokumendi tüüp. 'Tekst' on tekstidokumentide jaoks, 'foto' on "
+#~ "fotode jaoks. See säte määrab skannimise eraldusvõime, värvid ja "
+#~ "järeltöötluse."
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "Kasutus:\n"
+#~ "  %s [SEADE...] - Skannimise vahend"
+
+#, c-format
+#~ msgid ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+#~ msgstr ""
+#~ "Abi valikud:\n"
+#~ "  -d, --debug                     Silumisteadete printimine\n"
+#~ "  -v, --version                   Versiooni kuvamine\n"
+#~ "  -h, --help                      Abi valikute kuvamine\n"
+#~ "  --help-all                      Kõigi abi valikute kuvamine\n"
+#~ "  --help-gtk                      GTK+ valikute kuvamine"
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "GTK+ võtmed:\n"
+#~ "  --class=KLASS             Aknahalduri poolt kasutatav programmi klass\n"
+#~ "  --name=NIMI               Aknahalduri poolt kasutatav programmi nimi\n"
+#~ "  --screen=EKRAAN           Kasutatav X'i ekraan\n"
+#~ "  --sync                    X'i kutsungid sünkroonseks\n"
+#~ "  --gtk-module=MOODULID     Täiendavate GTK+ moodulite laadimine\n"
+#~ "  --g-fatal-warnings        Kõikide hoiatuste muutmine saatuslikuks"
+
+#~ msgid ""
+#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ msgstr ""
+#~ "Lehe külg, mida skannida. See võib olla üks järgnevaist: 'both', 'front', "
+#~ "'back'."
diff --git a/po/eu.po b/po/eu.po
index c90c29d..3cee432 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,326 +7,347 @@ msgid ""
 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-10-31 22:46+0000\n"
-"Last-Translator: Asier Sarasua Garmendia <Unknown>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-07-23 08:59+0000\n"
+"Last-Translator: Robert Ancell <robert.ancell@canonical.com>\n"
 "Language-Team: Basque <eu@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-11-01 05:18+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:44+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Simple Scan"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr "A_4"
+msgid "_Document"
+msgstr "_Dokumentua"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr "Es_kaneatu"
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "_Orrialde bakarra"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:10
 msgid "All Pages From _Feeder"
 msgstr "_Elikagailuko orri guztiak"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr "Atzealdea"
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
-msgstr "Moztu"
+msgid "_Stop Scan"
+msgstr "_Gelditu eskaneatzea"
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr "Moztu hautatutako orrialdea"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr "Aurrealdea"
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr "Aurrealdea eta atzealdea"
-
-#. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr "AEBetako le_gala"
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr "Berria"
-
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr "Orrialde-tamaina:"
+msgid "Text"
+msgstr "Testua"
 
 #. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
+#: ../data/simple-scan.ui.h:16
 msgid "Photo"
 msgstr "Argazkia"
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr "Hobespenak"
-
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
-msgstr "Biratu ezkerrera"
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr "_Posta elektronikoa"
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr "Biratu eskuinera"
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr "_Orrialdea"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
+#: ../data/simple-scan.ui.h:22
 msgid "Rotate _Left"
 msgstr "Biratu e_zkerrera"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
+#: ../data/simple-scan.ui.h:24
 msgid "Rotate _Right"
 msgstr "Biratu e_skuinera"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Biratu orrialdea ezkerrera (erlojuaren kontrako noranzkoan)"
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "_Moztu"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Biratu orrialdea eskuinra (erlojuaren noranzkoan)"
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "_Bat ere ez"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
 
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "AEBetako gutuna"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "AEBetako le_gala"
+
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr "Gorde"
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr "Gorde dokumentua fitxategi batean"
+msgid "_Custom"
+msgstr "_Pertsonalizatua"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr "Es_kaneatu"
+msgid "_Rotate Crop"
+msgstr "_Biratu mozketa"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
-msgstr "Eskaneatu"
+msgid "Move Left"
+msgstr "Mugitu ezkerrera"
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr "Eskaneatze-_jatorria:"
+msgid "Move Right"
+msgstr "Mugitu eskuinera"
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr "Eskaneatze-aldea:"
+msgid "_Help"
+msgstr "_Laguntza"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
-msgstr "Eskaneatu eskanerreko orrialde bakarra"
-
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr "Simple Scan"
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr "_Orrialde bakarra"
+msgid "_Contents"
+msgstr "_Edukiak"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
-msgstr "Hasi dokumetu berria"
+msgstr "Hasi dokumentu berria"
+
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "Berria"
 
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "Eskaneatu eskanerreko orrialde bakarra"
+
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
-msgstr "Gelditu"
+msgid "Scan"
+msgstr "Eskaneatu"
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr "Gorde dokumentua fitxategi batean"
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "Gorde"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
 msgid "Stop the current scan"
 msgstr "Gelditu uneko eskaneatzea"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr "Testua"
-
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr "_Baimendu"
+msgid "Stop"
+msgstr "Gelditu"
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
-msgstr "_Edukiak"
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Biratu orrialdea ezkerrera (erlojuaren kontrako noranzkoan)"
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr "_Moztu"
+msgid "Rotate Left"
+msgstr "Biratu ezkerrera"
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr "_Pertsonalizatua"
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Biratu orrialdea eskuinra (erlojuaren noranzkoan)"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr "_Dokumentua"
+msgid "Rotate Right"
+msgstr "Biratu eskuinera"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "Moztu hautatutako orrialdea"
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
-msgstr "_Posta elektronikoa"
+msgid "Crop"
+msgstr "Moztu"
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr "_Laguntza"
+msgid "_Username for resource:"
+msgstr "_Erabiltzaile-izena baliabiderako:"
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr "AEBetako gutuna"
+msgid "_Password:"
+msgstr "_Pasahitza:"
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr "_Bat ere ez"
+msgid "_Authorize"
+msgstr "_Baimendu"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr "_Orrialdea"
+msgid "Preferences"
+msgstr "Hobespenak"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr "_Pasahitza:"
+msgid "Scan S_ource:"
+msgstr "Eskaneatze-_jatorria:"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
-msgstr "Ar_gazki-bereizmena"
+msgid "_Text Resolution:"
+msgstr "_Testu-bereizmena:"
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr "_Biratu mozketa"
+msgid "_Photo Resolution:"
+msgstr "Ar_gazki-bereizmena:"
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
-msgstr "_Gelditu eskaneatzea"
+msgid "Scan Side:"
+msgstr "Eskaneatze-aldea:"
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
-msgstr "_Testu-bereizmena"
+msgid "Page Size:"
+msgstr "Orrialde-tamaina:"
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
-msgstr "_Erabiltzaile-izena baliabiderako:"
+msgid "Brightness:"
+msgstr "Distira:"
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
-msgstr "Eskaneatu dokumentuak"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr "Kontrastea:"
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
-msgstr "Eskaneatze-gailua"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr "Kalitatea:"
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
-msgstr "Eskaneatzearen zentzua"
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "Aurrealdea eta atzealdea"
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
-msgstr "Fitxategiak gordetzeko direktorioa"
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "Aurrealdea"
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
-msgstr "Paperaren altuera mm hamarrekoetan"
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "Atzealdea"
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr "Eskaneatutako irudiaren altuera pixeletan"
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "Eskaneatu dokumentuak"
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
-msgstr "Eskaneatuko den aldea"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "Leihoaren zabalera pixeletan"
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
-msgstr "Bereizmena argazkien eskaneatzerako"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "Leihoaren altuera pixeletan"
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
-msgstr "Bereizmena testuen eskaneatzerako"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "TRUE aplikazio-leihoa maximizatuta badago"
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
-msgstr "Eskaneatutako azken irudiaren bereizmena"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "Eskaneatze-gailua"
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
 msgstr "Irudiak eskuratzeko erabiliko den SANE gailua."
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
-msgstr "TRUE aplikazio-leihoa maximizatuta badago"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "Eskaneatuko den dokumentu-mota"
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
-"Eskanerraren noranzkoa eskaneatuko den orrialdean zehar. Hurrengoetako bat "
-"izan daiteke: 'goitik behera' 'behetik gora' 'ezkerretik eskuinera' "
-"'eskuinetik ezkerrera'"
+"Eskaneatuko den dokumentu-mota. Ezarpen honek eskaneatzearen bereizmena, "
+"koloreak eta posprozesatzea finkatzen du."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "Eskaneatzearen noranzkoa"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "Eskanerraren zentzua eskaneatutako orrian zehar."
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "Eskaneatutako irudiaren zabalera pixeletan"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
 msgstr ""
-"Fitxategiak gordeko diren direktorioa. Ez bada ezer ezartzen, balio "
-"lehenetsia dokumentuen direktorioa da."
+"Eskaneatutako irudiaren zabalera pixeletan. Parametro hau eskaneatutako "
+"azken orrialdearen baliora eguneratzen da."
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "Eskaneatutako irudiaren altuera pixeletan"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
@@ -334,242 +355,245 @@ msgstr ""
 "Eskaneatutako irudiaren altuera pixeletan. Parametro hau eskaneatutako azken "
 "orrialdearen baliora eguneratzen da."
 
-#: ../data/simple-scan.schemas.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "Paperaren zabalera mm hamarrenetan"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
-"Eskaneatutako paperaren altuera milimetro hamarrekoetan (edo 0 paperaren "
+"Eskaneatutako paperaren zabalera milimetro hamarrenetan (edo 0 paperaren "
 "detekzio automatikorako)."
 
-#: ../data/simple-scan.schemas.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "Paperaren altuera mm hamarrenetan"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Eskaneatutako paperaren altuera milimetro hamarrenetan (edo 0 paperaren "
+"detekzio automatikorako)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr "Eskanerraren distira"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr "Eskanerraren kontrastea"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
-"Eskaneatuko den aldea. Hurrengoetako bat izan daiteke: 'biak' 'aurrealdea' "
-"'atzealdea'"
 
-#: ../data/simple-scan.schemas.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "Eskaneatutako azken irudiaren bereizmena"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
 msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr "Aurretik eskaneatutako irudiaren bereizmena (puntuak hazbeteko)."
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "Argazkiak eskaneatzen erabiliko den bereizmena (puntuak hazbeteko)."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "Bereizmena testuen eskaneatzerako"
 
-#: ../data/simple-scan.schemas.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "Testua eskaneatzen erabiliko den bereizmena (puntuak hazbeteko)."
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"Eskaneatutako irudiaren zabalera pixeletan. Parametro hau eskaneatutako "
-"azken orrialdearen baliora eguneratzen da."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "Bereizmena argazkien eskaneatzerako"
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Eskaneatutako paperaren zabalera milimetro hamarrekoetan (edo 0 paperaren "
-"detekzio automatikorako)."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "Argazkiak eskaneatzen erabiliko den bereizmena (puntuak hazbeteko)."
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
-msgstr "Eskaneatuko den dokumentu-mota"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "Eskaneatuko den aldea"
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
-msgstr ""
-"Eskaneatuko den dokumentu-mota, 'testua' testu-dokumentuak badira, "
-"'argazkia' argazkiak badira. Ezarpen honek eskaneatze-bereizmena, koloreak "
-"eta post-tratamendua finkatzen du."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "Eskaneatuko den orrialdea."
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
-msgstr "Paperaren zabalera mm hamarrekoetan"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "Fitxategiak gordetzeko direktorioa"
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
-msgstr "Eskaneatutako irudiaren zabalera pixeletan"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Fitxategiak gordeko diren direktorioa. Ez bada ezer ezartzen, balio "
+"lehenetsia dokumentuen direktorioa da."
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
-msgstr "Leihoaren altuera pixeletan"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
-msgstr "Leihoaren zabalera pixeletan"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Ez dago eskanerrik erabilgarri. Mesedez, konektatu eskaner bat."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
 msgstr "Ezin da eskanerrarekin konektatu"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
 msgstr "Ezin da eskanerra abiarazi"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
 msgstr "Errorea eskanerrarekin komunikatzean"
 
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Erakutsi bertsioa"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Inprimatu arazketa-mezuak"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+"Konpondu Simple Scan-en bertsio zaharragoekin sortutako PDF fitxategiak"
+
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
 msgstr "Ezin izan da eskaneatu"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
 msgstr "Eskaneatutako dokumentua"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
-msgstr ""
-"Erabilera:\n"
-"  %s [GAILUA...] - Eskaneatzeko utilitatea"
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[DEVICE...] - Eskaneatze-aplikazioa"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
-msgstr ""
-"Laguntza-aukerak:\n"
-"  -d, --debug Inprimatu arazketa-mezuak\n"
-"  -v, --version Erakutsi argitaratze-bertsioa\n"
-"  -h, --help Erakutsi laguntza-aukerak\n"
-"  --help-all Erakutsi laguntza-aukera guztiak\n"
-"  --help-gtk erakutsi GTK+ aukerak"
-
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
-#, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
-msgstr ""
-"GTK+ aukerak:\n"
-"  --class=KLASEA Programaren klasea leiho-kudeatzaileak darabilen modura\n"
-"  --name=IZENA Programaren izena leiho-kudeatzaileak darabilen modura\n"
-"  --screen=PANTAILA X pantaila erabiltzeko\n"
-"  --sync Egin X dei sinkrono\n"
-"  --gtk-module=MODULUAK Kargatu GTK+ modulu gehigarriak\n"
-"  --g-fatal-warnings Egin abisu guztiak larri"
+msgid "Run '%s --help' to see a full list of available command line options."
+msgstr "Exekutatu '%s --help' komando-lerroko aukera guztiak zerrendatzeko."
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "Dokumentu.pdf eskaneatuta"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Erabiltzaile-izena eta pasahitza behar dira '%s' atzitzeko"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
 msgstr "Ez da eskanerrik detektatu"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
 msgstr "Egiaztatu zure eskanerra konektatuta eta piztuta dagoela"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr "PDF (orrialde anitzeko dokumentua)"
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr "JPEG (konprimitua)"
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr "PNG (galerarik gabea)"
-
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
 msgstr "Gorde honela..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
 msgstr "Irudi-fitxategiak"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
 msgstr "Fitxategi guztiak"
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
 msgstr "Hautatu fit_xategi-mota"
 
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF (orrialde anitzeko dokumentua)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (konprimitua)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (galerarik gabea)"
+
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
 msgstr "Ezin izan da fitxategia gorde"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Gordetzen ez baduzu, aldaketak betiko galduko dira."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
 msgstr "Gorde uneko dokumentua?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
 msgstr "Baztertu aldaketak"
 
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "Ezin izan da aurrebistarako irudia gorde"
+
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
 msgstr "Ezin izan da ireki irudiaren aurrebistarako aplikazioa"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
 msgstr "Ezin izan da ireki laguntza-fitxategia"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -598,76 +622,185 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
 msgstr "Simple Scan-i buruz"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
 msgstr "Dokumentuak eskaneatzeko tresna sinplea"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
+"  Asier Iturralde Sarasola https://launchpad.net/~asier-iturralde\n"
 "  Asier Sarasua Garmendia https://launchpad.net/~asarasuagarmendia\n"
-"  Jon Legarrea https://launchpad.net/~jonlegarrea"
+"  Ibai Oihanguren Sala https://launchpad.net/~ibai-oihanguren\n"
+"  Iñaki Larrañaga Murgoitio https://launchpad.net/~dooteo-zundan\n"
+"  Jon Legarrea https://launchpad.net/~jonlegarrea-deactivatedaccount\n"
+"  Kaiet https://launchpad.net/~kaiett\n"
+"  Oier Mees https://launchpad.net/~oier\n"
+"  Robert Ancell https://launchpad.net/~robert-ancell\n"
+"  Xabier Isla Rodriguez https://launchpad.net/~xabier.isla"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
 msgstr "Gorde dokumentua irten baino lehen?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
 msgstr "Irten gorde gabe"
 
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (lehenetsia)"
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#: ../src/ui.vala:1292
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (zirriborroa)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
-#, c-format
-msgid "%d dpi"
-msgstr "%d dpi"
-
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (bereizmen altua)"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
-msgstr "%d dpi (lehenetsia)"
+msgid "%d dpi"
+msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
 msgstr "Fitxategiak falta dira"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
 msgstr "Egiaztatu instalazioa"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
 msgstr "Aldatu e_skanerra"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
 msgstr "Automatikoa"
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
-msgstr "Dokumentu.pdf eskaneatuta"
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr "Ilunago"
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr "Argiago"
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr "Gutxiago"
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr "Gehiago"
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr "Minimoa"
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr "Maximoa"
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "Dokumentua gordetzen..."
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "%d orria (%d-etik) gordetzen"
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "Erabilera:\n"
+#~ "  %s [GAILUA...] - Eskaneatzeko utilitatea"
+
+#~ msgid ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ msgstr ""
+#~ "Eskanerraren noranzkoa eskaneatuko den orrialdean zehar. Hurrengoetako bat "
+#~ "izan daiteke: 'goitik behera' 'behetik gora' 'ezkerretik eskuinera' "
+#~ "'eskuinetik ezkerrera'"
+
+#~ msgid ""
+#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ msgstr ""
+#~ "Eskaneatuko den aldea. Hurrengoetako bat izan daiteke: 'biak' 'aurrealdea' "
+#~ "'atzealdea'"
+
+#~ msgid ""
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
+#~ msgstr ""
+#~ "Eskaneatuko den dokumentu-mota, 'testua' testu-dokumentuak badira, "
+#~ "'argazkia' argazkiak badira. Ezarpen honek eskaneatze-bereizmena, koloreak "
+#~ "eta post-tratamendua finkatzen du."
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "GTK+ aukerak:\n"
+#~ "  --class=KLASEA Programaren klasea leiho-kudeatzaileak darabilen modura\n"
+#~ "  --name=IZENA Programaren izena leiho-kudeatzaileak darabilen modura\n"
+#~ "  --screen=PANTAILA X pantaila erabiltzeko\n"
+#~ "  --sync Egin X dei sinkrono\n"
+#~ "  --gtk-module=MODULUAK Kargatu GTK+ modulu gehigarriak\n"
+#~ "  --g-fatal-warnings Egin abisu guztiak larri"
+
+#, c-format
+#~ msgid ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+#~ msgstr ""
+#~ "Laguntza-aukerak:\n"
+#~ "  -d, --debug Inprimatu arazketa-mezuak\n"
+#~ "  -v, --version Erakutsi argitaratze-bertsioa\n"
+#~ "  -h, --help Erakutsi laguntza-aukerak\n"
+#~ "  --help-all Erakutsi laguntza-aukera guztiak\n"
+#~ "  --help-gtk erakutsi GTK+ aukerak"
diff --git a/po/fi.po b/po/fi.po
index 8e9d604..ca0284f 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,322 +7,347 @@ msgid ""
 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-07-31 00:17+0000\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2013-09-22 12:07+0000\n"
 "Last-Translator: Jiri Grönroos <Unknown>\n"
 "Language-Team: Finnish <fi@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-10-22 04:47+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-23 05:24+0000\n"
+"X-Generator: Launchpad (build 16771)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Kuvanluku"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr "A_4"
+msgid "_Document"
+msgstr "_Asiakirja"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr "Lue kuv_a"
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "Yksi _sivu"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:10
 msgid "All Pages From _Feeder"
 msgstr "Kaikki sivut _laitteelta"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr "Takapuoli"
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
-msgstr "Rajaa"
+msgid "_Stop Scan"
+msgstr "Py_säytä kuvanluku"
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr "Rajaa nykyistä sivua"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr "Etupuoli"
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr "Etu- ja takapuoli"
-
-#. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr "US Legal"
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr "Uusi"
-
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr ""
+msgid "Text"
+msgstr "Teksti"
 
 #. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
+#: ../data/simple-scan.ui.h:16
 msgid "Photo"
 msgstr "Valokuva"
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr "Asetukset"
-
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
-msgstr "Kierrä vasemmalle"
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr "_Sähköposti"
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr "Kierrä oikealle"
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr "_Sivu"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
+#: ../data/simple-scan.ui.h:22
 msgid "Rotate _Left"
 msgstr "Kierrä _vasemmalle"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
+#: ../data/simple-scan.ui.h:24
 msgid "Rotate _Right"
 msgstr "Kierrä _oikealle"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Kierrä sivua vasemmalle (vastapäivään)"
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "_Rajaa"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Kierrä sivua oikealle (myötäpäivään)"
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "_Ei mitään"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "_Letter"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "US Legal"
 
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr "Tallenna"
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr ""
+msgid "_Custom"
+msgstr "_Muu"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr "Lue kuv_a"
+msgid "_Rotate Crop"
+msgstr "Kierrä rajausta"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
-msgstr "Lue"
+msgid "Move Left"
+msgstr "Siirrä vasemmalle"
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr "Lue lähtee_stä:"
+msgid "Move Right"
+msgstr "Siirrä oikealle"
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr ""
+msgid "_Help"
+msgstr "O_hje"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
-msgstr "Lue yksi sivu kuvanlukijalta"
-
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr "Yksinkertainen kuvanluku"
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr "Yksi _sivu"
+msgid "_Contents"
+msgstr "_Sisältö"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
 msgstr "Aloita uusi asiakirja"
 
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "Uusi"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "Lue yksi sivu kuvanlukijalta"
+
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
-msgstr "Pysäytä"
+msgid "Scan"
+msgstr "Lue"
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr "Tallenna asiakirja tiedostoon"
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "Tallenna"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
 msgid "Stop the current scan"
 msgstr "Pysäytä kuvan lukeminen"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr "Teksti"
-
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr "_Valtuuta"
+msgid "Stop"
+msgstr "Pysäytä"
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
-msgstr "_Sisältö"
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Kierrä sivua vasemmalle (vastapäivään)"
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr "_Rajaa"
+msgid "Rotate Left"
+msgstr "Kierrä vasemmalle"
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr "_Muu"
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Kierrä sivua oikealle (myötäpäivään)"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr "_Asiakirja"
+msgid "Rotate Right"
+msgstr "Kierrä oikealle"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "Rajaa nykyistä sivua"
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
-msgstr "_Sähköposti"
+msgid "Crop"
+msgstr "Rajaa"
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr "O_hje"
+msgid "_Username for resource:"
+msgstr "Resurssin _käyttäjänimi:"
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr "_Letter"
+msgid "_Password:"
+msgstr "_Salasana:"
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr "_Ei mitään"
+msgid "_Authorize"
+msgstr "_Valtuuta"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr "_Sivu"
+msgid "Preferences"
+msgstr "Asetukset"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr "_Salasana:"
+msgid "Scan S_ource:"
+msgstr "Lue lähtee_stä:"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
-msgstr "_Valokuvan tarkkuus:"
+msgid "_Text Resolution:"
+msgstr "_Tekstin tarkkuus:"
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr "Kierrä rajausta"
+msgid "_Photo Resolution:"
+msgstr "_Valokuvan tarkkuus:"
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
-msgstr "Py_säytä kuvanluku"
+msgid "Scan Side:"
+msgstr "Luettava puoli:"
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
-msgstr "_Tekstin tarkkuus:"
+msgid "Page Size:"
+msgstr "Sivun koko:"
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
-msgstr "Resurssin _käyttäjänimi:"
+msgid "Brightness:"
+msgstr "Kirkkaus:"
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
-msgstr "Lue asiakirjoja kuvanlukijalta"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr "Kontrasti:"
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
-msgstr "Laite jolta luetaan"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr "Laatu:"
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
-msgstr "Lukemisen suunta"
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "Etu- ja takapuoli"
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
-msgstr "Kansio, johon tiedostot tallennetaan"
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "Etupuoli"
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
-msgstr ""
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "Takapuoli"
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr "Luetun kuvan korkeus pikseleissä"
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "Lue asiakirjoja kuvanlukijalta"
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "Ikkunan leveys pikseleinä"
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
-msgstr "Tarkkuus valokuvien luvulle"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "Ikkunan korkeus pikseleinä"
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
-msgstr "Tarkkuus tekstin lukemiseen"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "Arvo TOSI, jos sovelluksen ikkuna on suurennettu"
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
-msgstr "Viimeisimmän luetun kuvan tarkkuus"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "Laite jolta luetaan"
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
 msgstr "SANE-laite jolta kuvat luetaan."
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "Luettavan asiakirjan tyyppi"
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
+"Luettavan asiakirjan tyyppi. Tämä asetus määrittää tarkkuuden, värit ja "
+"jälkiprosessoinnin."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "Lukemisen suunta"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "Skannerin kulkusuunta skannattavan sivun suhteen."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "Luettavan kuvan leveys pikseleinä"
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
 msgstr ""
-"Kansio, johon tiedostot tallennetaan. Oletusasetus on Asiakirjat-kansio."
+"Skannattavan kuvan leveys pikseleinä. Arvo päivittyy viimeksi skannatun "
+"sivun mukaan."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "Luetun kuvan korkeus pikseleissä"
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
@@ -330,223 +355,243 @@ msgstr ""
 "Luettavan kuvan korkeus pikseleinä. Arvo päivittyy viimeisimmän luetun sivun "
 "mukaan."
 
-#: ../data/simple-scan.schemas.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "Paperin leveys kymmenesosamilleinä"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
+"Paperin leveys kymmenesosamilleinä (tai 0 automaattista paperintunnistusta "
+"varten)."
 
-#: ../data/simple-scan.schemas.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "Paperin pituus kymmenesosamilleinä"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
 msgstr ""
+"Paperin pituus kymmenesosamilleinä (tai 0 automaattista paperintunnistusta "
+"varten)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr "Kuvanluvun kirkkaus"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Kirkkaussäätö asteikolla -100 - 100 (0 on ei yhtään)"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr "Kuvanluvun kontrasti"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Kontrastisäätö asteikolla -100 - 100 (0 on ei yhtään)"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "Viimeisimmän luetun kuvan tarkkuus"
 
-#: ../data/simple-scan.schemas.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
 msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr ""
+msgstr "Viimeksi skannatun kuvan resoluutio pisteinä tuumaa kohti."
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "Tarkkuus tekstin lukemiseen"
 
-#: ../data/simple-scan.schemas.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
 msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr ""
+msgstr "Käytettävä resoluutio pisteinä tuumaa kohti skannattaessa tekstiä."
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "Tarkkuus valokuvien luvulle"
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "Käytettävä resoluutio pisteinä tuumaa kohti skannattaessa kuvia."
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
-msgstr "Luettavan asiakirjan tyyppi"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "Skannattava puoli"
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "Skannattavan sivun puoli."
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "Kansio, johon tiedostot tallennetaan"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
+"Kansio, johon tiedostot tallennetaan. Oletusasetus on Asiakirjat-kansio."
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
-msgstr "Luettavan kuvan leveys pikseleinä"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr "JPEG-pakkaukseen käytettävä laatuarvo"
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
-msgstr "Ikkunan korkeus pikseleinä"
-
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
-msgstr "Ikkunan leveys pikseleinä"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr "JPEG-pakkaukseen käytettävä laatuarvo."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Kuvanlukijoita ei löydy. Yhdistä kuvanlukija."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
 msgstr "Kuvanlukijaan ei voi yhdistää"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
 msgstr "Kuvanluvun käynnistäminen ei onnistu"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
 msgstr "Virhe viestinnässä kuvanlukijan kanssa"
 
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Näytä julkaisuversio"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Tulosta virheenjäljitysviestit"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr "Korjaa vanhemmilla Kuvanlukijan versioilla luodut PDF-tiedostot"
+
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
 msgstr "Kuvanluku epäonnistui"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
 msgstr "Kuvanlukuasiakirja"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
-msgstr ""
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[LAITE...] - Skannaus apuohjelma"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
-msgstr ""
+msgid "Run '%s --help' to see a full list of available command line options."
+msgstr "Näet kaikki komentorivivalitsimet komennolla \"%s --help\""
 
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
-#, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
-msgstr ""
-"GTK+-valitsimet:\n"
-"  --class=LUOKKA                  Ikkunahallinnan käyttämä ohjelmaluokka\n"
-"  --name=NIMI                     Ikkunahallinnan käyttämä ohjelman nimi\n"
-"  --screen=RUUTU                  Käytettävä X-ruutu\n"
-"  --sync                          Tee X-kutsut synkronisesti\n"
-"  --gtk-module=MODUULIT           Lataa lisäksi GTK+-moduulit\n"
-"  --g-fatal-warnings              Tee kaikista varoituksista kuolettavia"
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "Asiakirja kuvanlukijasta.pdf"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Käyttäjänimi ja salasana vaaditaan laitteelle ”%s” pääsemiseksi"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
 msgstr "Kuvanlukijoita ei havaittu"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
 msgstr "Varmista että kuvanlukijasi on yhdistetty ja kytketty päälle"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr "PDF (monisivuinen asiakirja)"
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr "JPEG (pakattu)"
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr "PNG (häviötön)"
-
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
 msgstr "Tallenna nimellä..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
 msgstr "Kuvatiedostot"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
 msgstr "Kaikki tiedostot"
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
 msgstr "Valitse tiedosto_tyyppi"
 
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF (monisivuinen asiakirja)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (pakattu)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (häviötön)"
+
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
 msgstr "Tiedoston tallennus epäonnistui"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
-msgstr ""
+msgstr "Jos et tallenna, muutokset katoavat pysyvästi."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
-msgstr ""
+msgstr "Tallennetaanko nykyinen asiakirja?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
-msgstr ""
+msgstr "Hylkää muutokset"
+
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "Esikatselun tallennus epäonnistui"
 
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
 msgstr "Esikatselusovelluksen avaus epäonnistui"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
 msgstr "Ohjetiedostoa ei voi avata"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -561,79 +606,199 @@ msgid ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
+"Tämä ohjelma on vapaa ohjelmisto: voit jakaa sitä eteenpäin ja/tai muokata\n"
+"sitä Free Software Foundationin julkaiseman GNU General Publis Licence:n "
+"ehtojen mukaisesti,\n"
+"joko Lisenssin version 3, tai\n"
+"(valintasi mukaan) minkä tahansa muun\n"
+"\n"
+"Tätä ohjelmaa jaetaan siinä toivossa että se olisi käyttökelpoinen,\n"
+"mutta ILMAN MITÄÄN TAKUUTA; ilman edes epäsuoraa takuuta\n"
+"KAUPALLISUUDESTA tai HYÖDYSTÄ YKSITTÄISEEN TARKOITUKSEEN. Katso\n"
+"lisätietoja lisenssistä GNU General Public Licence.\n"
+"\n"
+"Sinun olisi pitänyt saada kopio lisenssistä GNU General Public Licence\n"
+"tämän ohjelman mukana. Jos et saanut, katso lisätietoja osoitteesta "
+"<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
-msgstr "Tietoja Yksinkertainen kuvanluku (”Simple Scan”) -sovelluksesta"
+msgstr "Tietoja sovelluksesta"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
 msgstr "Yksinkertainen asiakirjojen kuvanlukutyökalu"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Elias Julkunen https://launchpad.net/~eliasj\n"
+"  Heidi Mattila https://launchpad.net/~hessuk\n"
 "  Jiri Grönroos https://launchpad.net/~jiri-gronroos\n"
-"  Timo Jyrinki https://launchpad.net/~timo-jyrinki"
+"  Juhani Numminen https://launchpad.net/~jsonic\n"
+"  Ncl8 https://launchpad.net/~crofle\n"
+"  Robert Ancell https://launchpad.net/~robert-ancell\n"
+"  Saku Salo https://launchpad.net/~sos\n"
+"  Timo Jyrinki https://launchpad.net/~timo-jyrinki\n"
+"  Ville Pilvio https://launchpad.net/~vpilvio"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
-msgstr ""
+msgstr "Tallennetaanko asiakirja ennen ohjelman sulkemista?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
-msgstr ""
+msgstr "Sulje tallentamatta"
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (oletus)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#: ../src/ui.vala:1292
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (vedos)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
-#, c-format
-msgid "%d dpi"
-msgstr "%d dpi"
-
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (korkea tarkkuus)"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
-msgstr "%d dpi (oletus)"
+msgid "%d dpi"
+msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
 msgstr "Tiedostoja puuttuu"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
 msgstr "Tarkista asennuksesi tila"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
 msgstr "Muuta _kuvanlukijaa"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
-msgstr ""
+msgstr "Automaattinen"
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
-msgstr "Asiakirja kuvanlukijasta.pdf"
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr "Tummempi"
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr "Vaaleampi"
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr "Vähemmän"
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr "Enemmän"
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr "Heikompi"
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr "Parempi"
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "Tallennetaan asiakirjaa..."
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "Tallennetaan sivua %d/%d"
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "GTK+-valitsimet:\n"
+#~ "  --class=LUOKKA                  Ikkunahallinnan käyttämä ohjelmaluokka\n"
+#~ "  --name=NIMI                     Ikkunahallinnan käyttämä ohjelman nimi\n"
+#~ "  --screen=RUUTU                  Käytettävä X-ruutu\n"
+#~ "  --sync                          Tee X-kutsut synkronisesti\n"
+#~ "  --gtk-module=MODUULIT           Lataa lisäksi GTK+-moduulit\n"
+#~ "  --g-fatal-warnings              Tee kaikista varoituksista kuolettavia"
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "Käyttö:\n"
+#~ "  %s [LAITE...] - Kuvanlukutyökalu"
+
+#~ msgid ""
+#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ msgstr "Skannattava puoli. Mahdollisia valintoja ovat: molemmat, etu ja taka"
+
+#~ msgid ""
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
+#~ msgstr ""
+#~ "Skannattavan dokumentin luokka. Valitse 'teksti' tekstidokumentteja varten "
+#~ "tai 'kuva' kuvia varten. Tämä asetus määrää skannaus koon, värit ja "
+#~ "jälkiprosessoinnin."
+
+#, c-format
+#~ msgid ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+#~ msgstr ""
+#~ "Apuvalinnat:\n"
+#~ "  -d, --debug Tulosta virheenjäljitysviestit\n"
+#~ "  -v, --version Näytä jakeluversio\n"
+#~ "  -h, --help Näytä apuvalinnat\n"
+#~ "  --help-all Näytä kaikki apuvalinnat\n"
+#~ "  --help-gtk Näytä kaikki GTK+-valinnat"
+
+#~ msgid ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ msgstr ""
+#~ "Skannerin suunta skannatun sivun yli. Se voi olla jokin seuraavista: 'top-to-"
+#~ "bottom' 'bottom-to-top' 'left-to-right' 'right-to-left' ('ylhäältä alas' "
+#~ "'alhaalta ylös' 'vasemmalta oikealle' 'oikealta vasemmalle')"
diff --git a/po/fr.po b/po/fr.po
index 69f84ba..287a8d4 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,327 +7,348 @@ msgid ""
 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-05 07:41+0000\n"
-"Last-Translator: Bruno Patri <bruno.patri@gmail.com>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-09-27 21:23+0000\n"
+"Last-Translator: 65GYgzf <Unknown>\n"
 "Language-Team: French <fr@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-10-22 04:47+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:45+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4 &#xD7; 6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Outil de numérisation Simple Scan"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr "A_4"
+msgid "_Document"
+msgstr "_Document"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr "Nu_mériser"
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "_Page unique"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:10
 msgid "All Pages From _Feeder"
 msgstr "Toutes les pages du _bac"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr "Verso"
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
-msgstr "Recadrer"
+msgid "_Stop Scan"
+msgstr "_Arrêter la numérisation"
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr "Recadrer la page sélectionnée"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr "Recto"
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr "Recto verso"
-
-#. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr "_Legal (US)"
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr "Nouveau"
-
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr "Taille de page :"
+msgid "Text"
+msgstr "Texte"
 
 #. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
+#: ../data/simple-scan.ui.h:16
 msgid "Photo"
 msgstr "Photo"
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr "Préférences"
-
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
-msgstr "Pivoter sur la gauche"
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr "_Courriel"
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr "Pivoter sur la droite"
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr "_Page"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
+#: ../data/simple-scan.ui.h:22
 msgid "Rotate _Left"
 msgstr "Pivoter vers la _gauche"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
+#: ../data/simple-scan.ui.h:24
 msgid "Rotate _Right"
 msgstr "Pivoter vers la _droite"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr ""
-"Pivoter la page vers la gauche (sens inverse des aiguilles d'une montre)"
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "Re_cadrer"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Pivoter la page vers la droite (sens des aiguilles d'une montre)"
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "Aucu_n"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "_Letter (US)"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "_Legal (US)"
 
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr "Enregistrer"
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr "Enregistrer le document dans un fichier"
+msgid "_Custom"
+msgstr "_Personnalisé"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr "Nu_mériser"
+msgid "_Rotate Crop"
+msgstr "Pivote_r la selection"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
-msgstr "Numériser"
+msgid "Move Left"
+msgstr "Déplacer à gauche"
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr "S_ource de numérisation :"
+msgid "Move Right"
+msgstr "Déplacer à droite"
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr "Face à numériser :"
+msgid "_Help"
+msgstr "_Aide"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
-msgstr "Numériser une seule page depuis le scanner"
-
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr "Numérisation simple"
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr "_Page unique"
+msgid "_Contents"
+msgstr "_Contenus"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
 msgstr "Créer un nouveau document"
 
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "Nouveau"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "Numériser une seule page depuis le scanner"
+
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
-msgstr "Arrêter"
+msgid "Scan"
+msgstr "Numériser"
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr "Enregistrer le document dans un fichier"
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "Enregistrer"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
 msgid "Stop the current scan"
 msgstr "Arrêter la numérisation en cours"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr "Texte"
-
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr "_Autoriser"
+msgid "Stop"
+msgstr "Arrêter"
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
-msgstr "_Contenus"
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr ""
+"Pivoter la page vers la gauche (sens inverse des aiguilles d'une montre)"
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr "Re_cadrer"
+msgid "Rotate Left"
+msgstr "Pivoter vers la gauche"
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr "_Personnalisé"
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Pivoter la page vers la droite (sens des aiguilles d'une montre)"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr "_Document"
+msgid "Rotate Right"
+msgstr "Pivoter vers la droite"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "Recadrer la page sélectionnée"
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
-msgstr "_Courriel"
+msgid "Crop"
+msgstr "Recadrer"
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr "_Aide"
+msgid "_Username for resource:"
+msgstr "_Utilisateur :"
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr "_Letter (US)"
+msgid "_Password:"
+msgstr "_Mot de passe :"
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr "Aucu_n"
+msgid "_Authorize"
+msgstr "_Autoriser"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr "_Page"
+msgid "Preferences"
+msgstr "Préférences"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr "_Mot de passe :"
+msgid "Scan S_ource:"
+msgstr "S_ource de numérisation :"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
-msgstr "Résolution de la _Photo :"
+msgid "_Text Resolution:"
+msgstr "Résolution pour le _texte :"
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr "Pivote_r la selection"
+msgid "_Photo Resolution:"
+msgstr "Résolution pour la _photo :"
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
-msgstr "_Arrêter la numérisation"
+msgid "Scan Side:"
+msgstr "Face à numériser :"
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
-msgstr "Résolution du _Texte :"
+msgid "Page Size:"
+msgstr "Taille de page :"
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
-msgstr "_Utilisateur :"
+msgid "Brightness:"
+msgstr "Luminosité :"
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
-msgstr "Numériser des documents"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr "Contraste :"
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
-msgstr "Numériser depuis"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr "Qualité :"
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
-msgstr "Sens de numérisation"
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "Recto verso"
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
-msgstr "Dossier dans lequel les fichiers sont enregistrés"
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "Recto"
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
-msgstr "Hauteur du papier en dixièmes de mm"
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "Verso"
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr "Hauteur de l'image numérisée en pixels"
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "Numériser des documents"
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
-msgstr "Face(s) de la page à numériser"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "Largeur de la fenêtre en pixels"
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
-msgstr "Résolution pour des numérisations de photos"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "Hauteur de la fenêtre en pixels"
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
-msgstr "Résolution pour des numérisations de textes"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "VRAI si la fenêtre de l'application est maximisée"
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
-msgstr "Résolution de la dernière image numérisée"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "Numériser depuis"
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
 msgstr "Périphérique SANE à utiliser pour l'acquisition des images."
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
-msgstr "VRAI si la fenêtre de l'application est maximisée"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "Nature du document qui va être numérisé"
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
-"Direction du balayage lors de la numérisation de la page. Celle-ci peut "
-"être : de haut en bas ; de bas en haut ; de gauche à droite ; de droite à "
-"gauche"
+"Type de document numérisé. Ce réglage définit la résolution de numérisation, "
+"les couleurs et le post-traitement."
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "Sens de numérisation"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "Le sens du scanner par rapport à la page numérisée."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "Largeur de l'image numérisée en pixels"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
 msgstr ""
-"Le dossier où les fichiers sont enregistrés. S'il n'est pas défini, le "
-"dossier documents sera utilisé par défaut."
+"La largeur de l'image numérisée en pixels. Cette valeur est mise à jour en "
+"fonction de la dernière page numérisée."
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "Hauteur de l'image numérisée en pixels"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
@@ -335,250 +356,253 @@ msgstr ""
 "La hauteur de l'image numérisée en pixels. Cette valeur est mise à jour en "
 "fonction de la dernière page numérisée."
 
-#: ../data/simple-scan.schemas.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "Largeur du papier en dixièmes de mm."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
-"La hauteur du papier en dixièmes de mm (ou 0 pour une détection automatique "
+"La largeur du papier en dixièmes de mm (ou 0 pour une détection automatique "
 "du papier)."
 
-#: ../data/simple-scan.schemas.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "Hauteur du papier en dixièmes de mm"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
 msgstr ""
-"La ou les faces de la page à numériser. Cela peut être au choix : « Recto "
-"verso », « Recto » ou « Verso »"
+"La hauteur du papier en dixièmes de mm (ou 0 pour une détection automatique "
+"du papier)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr "Luminosité de la numérisation"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Ajustement de la luminosité de -100 à 100 (0 pour aucun)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr "Contraste de la numérisation"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Ajustement du contraste de -100 à 100 (0 pour aucun)."
 
-#: ../data/simple-scan.schemas.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "Résolution de la dernière image numérisée"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
 msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr "La résolution de la dernière image numérisée en points par pouce."
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-"La résolution en points par pouce à utiliser lors de la numérisation de "
-"photos."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "Résolution des numérisations de textes"
 
-#: ../data/simple-scan.schemas.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 "La résolution en points par pouce à utiliser lors de la numérisation de "
 "texte."
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"La largeur de l'image numérisée en pixels. Cette valeur est mise à jour en "
-"fonction de la dernière page numérisée."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "Résolution des numérisations de photos"
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
-"La largeur du papier en dixièmes de mm (ou 0 pour une détection automatique "
-"du papier)."
+"La résolution en points par pouce à utiliser lors de la numérisation de "
+"photos."
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
-msgstr "Nature du document qui va être numérisé"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "Face(s) de la page à numériser"
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
-msgstr ""
-"Nature du document qui va être numérisé. « texte » pour les documents texte, "
-"« photo » pour les photographies. Ce paramètre détermine la résolution de "
-"numérisation, le nombre de couleurs et les traitements postérieurs."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "Le côté de la page à numériser."
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
-msgstr "Largeur du papier en dixièmes de mm."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "Dossier dans lequel les fichiers sont enregistrés"
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
-msgstr "Largeur de l'image numérisée en pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Le dossier où les fichiers sont enregistrés. S'il n'est pas défini, le "
+"dossier documents sera utilisé par défaut."
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
-msgstr "Hauteur de la fenêtre en pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr "Taux de qualité à utiliser pour la compression JPEG"
 
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
-msgstr "Largeur de la fenêtre en pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr "Taux de qualité à utiliser pour la compression JPEG."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 "Aucun périphérique de numérisation disponible. Veuillez en connecter un."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
 msgstr "Impossible de se connecter au scanner"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
 msgstr "Impossible de démarrer la numérisation"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
 msgstr "Erreur de communication avec le scanner"
 
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Affiche la version du logiciel"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Afficher les messages de débogage"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+"Corriger les fichiers PDF générés avec les anciennes versions de Simple Scan"
+
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
 msgstr "Échec de la numérisation"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
 msgstr "Document numérisé"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
-msgstr ""
-"Usage :\n"
-"  %s [PÉRIPHÉRIQUE...] - utilitaire de numérisation"
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[DEVICE...] - Outil de numérisation"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
+msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
-"Options d'aide :\n"
-"  -d, --debug Affiche les messages d'erreur\n"
-"  -v, --version Affiche le numéro de version\n"
-"  -h, --help Affiche les options d'aide\n"
-"  --help-all Affiche toutes les options d'aide\n"
-"  --help-gtk Affiche les options de GTK+"
-
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
-#, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
-msgstr ""
-"Options GTK+ :\n"
-"  --class=CLASSE Classe du programme telle qu'utilisée par le gestionnaire "
-"de fenêtres\n"
-"  --name=NOM Nom du programme tel qu'utilisé par le gestionnaire de "
-"fenêtres\n"
-"  --screen=ÉCRAN Écran X à utiliser\n"
-"  --sync Rendre les appels X synchrones\n"
-"  --gtk-module=MODULES Charger des modules GTK+ supplémentaires\n"
-"  --g-fatal-warnings Rendre tous les avertissements fatals"
+"Exécutez « %s --help » pour voir la liste complète des options disponibles "
+"en ligne de commande."
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "Document.pdf numérisé"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Nom d'utilisateur et mot de passe nécessaires pour accéder à « %s »"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
-msgstr "Aucun scanner n'a été détecté"
+msgstr "Aucun scanner n'a été détecté."
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
-msgstr "Veuillez vérifier que votre scanner est connecté et sous tension"
-
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr "PDF (document multi-pages)"
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr "JPEG (compressé)"
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr "PNG (sans perte)"
+msgstr "Veuillez vérifier que votre scanner est connecté et sous tension."
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
-msgstr "Enregistrer sous..."
+msgstr "Enregistrer sous…"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
 msgstr "Fichiers images"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
 msgstr "Tous les fichiers"
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
 msgstr "Sélectionnez le _type de fichier"
 
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF (document multi-pages)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (compressé)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (sans perte)"
+
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
 msgstr "Impossible d'enregistrer le fichier"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 "Si vous n'enregistrez pas, les modifications seront définitivement perdues."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
 msgstr "Enregistrer le document actuel ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
 msgstr "Abandonner les modifications"
 
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "Impossible d'enregistrer l'image pour la prévisualiser"
+
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
-msgstr "Impossible d'ouvrir l'application de prévisualisation d'image"
+msgstr "Impossible d'ouvrir l'aperçu de l'image"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
 msgstr "Impossible d'ouvrir le fichier d'aide"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -608,88 +632,214 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
 msgstr "À propos de Simple Scan"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
 msgstr "Numériser simplement vos documents"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
+"  65GYgzf https://launchpad.net/~65gygzf\n"
 "  Alexandre Franke https://launchpad.net/~afranke\n"
-"  Bruno Patri https://launchpad.net/~bruno-patri\n"
-"  François https://launchpad.net/~francois-michonneau\n"
+"  Alexandre Pliarchopoulos https://launchpad.net/~al-pliar\n"
+"  Antoine Pernot https://launchpad.net/~antoinepernot\n"
+"  Audiger Jeremy https://launchpad.net/~tankypon\n"
+"  Bruno Patri https://launchpad.net/~bruno666\n"
+"  Christophe Herot https://launchpad.net/~tictoc-free\n"
+"  Darknautilus https://launchpad.net/~darknautilus\n"
+"  David Bosman https://launchpad.net/~david-bosman\n"
+"  Emmanuel Sunyer https://launchpad.net/~esunyer\n"
+"  Fabien Lusseau https://launchpad.net/~fabien-beosfrance\n"
+"  Florent Thévenet https://launchpad.net/~florent-thevenet\n"
 "  François Tissandier https://launchpad.net/~baloo\n"
+"  Grégoire Seux https://launchpad.net/~kamaradclimber\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"
+"  Nicolas Delvaux https://launchpad.net/~malizor\n"
+"  Olivier Febwin https://launchpad.net/~febcrash\n"
+"  Ozouli.SaLeH https://launchpad.net/~ouzouli\n"
 "  Paul Forget https://launchpad.net/~paul92\n"
 "  Pierre Slamich https://launchpad.net/~pierre-slamich\n"
 "  RemiJ https://launchpad.net/~remij\n"
-"  Viale Fabrice https://launchpad.net/~viale-fabrice\n"
+"  Simon THOBY https://launchpad.net/~simonthoby\n"
+"  Stanislas Michalak https://launchpad.net/~stanislas-michalak\n"
+"  Sylvie Gallet https://launchpad.net/~sylvie-gallet\n"
+"  Xavier Guillot https://launchpad.net/~valeryan-24\n"
 "  Xavier Verne https://launchpad.net/~xavier-verne\n"
-"  beudbeud https://launchpad.net/~beudbeud"
+"  YannUbuntu https://launchpad.net/~yannubuntu\n"
+"  beudbeud https://launchpad.net/~beudbeud\n"
+"  blackbg https://launchpad.net/~corentin-cadiou\n"
+"  claude-Emile https://launchpad.net/~ch370648\n"
+"  loic08 https://launchpad.net/~loic08\n"
+"  londumas https://launchpad.net/~helion331990\n"
+"  torglut https://launchpad.net/~torglut"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
 msgstr "Enregistrer le document avant de quitter ?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
 msgstr "Quitter sans enregistrer"
 
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d ppp (par défaut)"
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#: ../src/ui.vala:1292
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (brouillon)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
-#, c-format
-msgid "%d dpi"
-msgstr "%d ppp"
-
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d ppp (haute résolution)"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
-msgstr "%d ppp (par défaut)"
+msgid "%d dpi"
+msgstr "%d ppp"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
 msgstr "Fichiers manquants"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
 msgstr "Veuillez vérifier votre installation"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
-msgstr "Changer de _Scanner"
+msgstr "Changer de _scanner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
 msgstr "Automatique"
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
-msgstr "Document.pdf numérisé"
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr "Plus foncé"
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr "Plus clair"
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr "Moins"
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr "Plus"
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr "Minimum"
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr "Maximum"
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "Enregistrement du document…"
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "Enregistrement de la page %d sur %d"
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "Usage :\n"
+#~ "  %s [PÉRIPHÉRIQUE...] - utilitaire de numérisation"
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "Options GTK+ :\n"
+#~ "  --class=CLASSE Classe du programme telle qu'utilisée par le gestionnaire "
+#~ "de fenêtres\n"
+#~ "  --name=NOM Nom du programme tel qu'utilisé par le gestionnaire de "
+#~ "fenêtres\n"
+#~ "  --screen=ÉCRAN Écran X à utiliser\n"
+#~ "  --sync Rendre les appels X synchrones\n"
+#~ "  --gtk-module=MODULES Charger des modules GTK+ supplémentaires\n"
+#~ "  --g-fatal-warnings Rendre tous les avertissements fatals"
+
+#, c-format
+#~ msgid ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+#~ msgstr ""
+#~ "Options d'aide :\n"
+#~ "  -d, --debug Affiche les messages d'erreur\n"
+#~ "  -v, --version Affiche le numéro de version\n"
+#~ "  -h, --help Affiche les options d'aide\n"
+#~ "  --help-all Affiche toutes les options d'aide\n"
+#~ "  --help-gtk Affiche les options de GTK+"
+
+#~ msgid ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ msgstr ""
+#~ "Direction du balayage lors de la numérisation de la page. Celle-ci peut "
+#~ "être : de haut en bas ; de bas en haut ; de gauche à droite ; de droite à "
+#~ "gauche"
+
+#~ msgid ""
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
+#~ msgstr ""
+#~ "Nature du document qui va être numérisé. « texte » pour les documents texte, "
+#~ "« photo » pour les photographies. Ce paramètre détermine la résolution de "
+#~ "numérisation, le nombre de couleurs et les traitements postérieurs."
+
+#~ msgid ""
+#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ msgstr ""
+#~ "La ou les faces de la page à numériser. Cela peut être au choix : « Recto "
+#~ "verso », « Recto » ou « Verso »"
diff --git a/po/gd.po b/po/gd.po
new file mode 100644
index 0000000..a6bded6
--- /dev/null
+++ b/po/gd.po
@@ -0,0 +1,736 @@
+# Gaelic; Scottish translation for simple-scan
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the simple-scan package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: simple-scan\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-04-17 06:12+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"Language-Team: Gaelic; Scottish <gd@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: 2013-09-13 05:45+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
+
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Sgana Simplidh"
+
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: ../data/simple-scan.ui.h:4
+msgid "_Document"
+msgstr "_Sgrìobhainn"
+
+#. Scan menu item
+#: ../data/simple-scan.ui.h:6
+msgid "Sc_an"
+msgstr "Sg_anaich"
+
+#. Toolbar scan menu item to scan a single page from the scanner
+#: ../data/simple-scan.ui.h:8
+msgid "Single _Page"
+msgstr "Singilte _Duilleag"
+
+#. Toolbar scan menu item to scan all pages from a document feeder
+#: ../data/simple-scan.ui.h:10
+msgid "All Pages From _Feeder"
+msgstr "H-uile duilleag Bhon _Biathaiche"
+
+#. Menu entry to stop current scan
+#: ../data/simple-scan.ui.h:12
+msgid "_Stop Scan"
+msgstr "_Stad Sganaich"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:14
+msgid "Text"
+msgstr "Teacsa"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:16
+msgid "Photo"
+msgstr "Dealbh"
+
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr "_Postd"
+
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr "_Duilleag"
+
+#. Menu item to rotate page to left (anti-clockwise)
+#: ../data/simple-scan.ui.h:22
+msgid "Rotate _Left"
+msgstr "Cuairtich _Clì"
+
+#. Menu item to rotate page to right (clockwise)
+#: ../data/simple-scan.ui.h:24
+msgid "Rotate _Right"
+msgstr "Cuairtich _Deas"
+
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "_Buain"
+
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "_Neoni"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "_Litir"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "La_ghail"
+
+#. Radio button for cropping page to 4x6 inch
+#: ../data/simple-scan.ui.h:40
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
+
+#. Radio button for cropping to custom page size
+#: ../data/simple-scan.ui.h:42
+msgid "_Custom"
+msgstr "_Gnàths"
+
+#. Menu item to rotate the crop area
+#: ../data/simple-scan.ui.h:44
+msgid "_Rotate Crop"
+msgstr "_Cuairtich Buain"
+
+#. Menu item to move the selected page to the left
+#: ../data/simple-scan.ui.h:46
+msgid "Move Left"
+msgstr "Gluais Clì"
+
+#. Menu item to move the selected page to the right
+#: ../data/simple-scan.ui.h:48
+msgid "Move Right"
+msgstr "Gluais Deas"
+
+#. Label on help menu
+#: ../data/simple-scan.ui.h:50
+msgid "_Help"
+msgstr "_Cobhair"
+
+#. Help|Contents menu
+#: ../data/simple-scan.ui.h:52
+msgid "_Contents"
+msgstr "_Clàr-innse"
+
+#. Tooltip for new document button
+#: ../data/simple-scan.ui.h:54
+msgid "Start a new document"
+msgstr "Tòisich sgrìobhainn ùr"
+
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "Ùr"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "Sganaich duilleag singilte bhon sganair"
+
+#. Label on scan toolbar item
+#: ../data/simple-scan.ui.h:59
+msgid "Scan"
+msgstr "Sganaich"
+
+#. Tooltip for save toolbar button
+#: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr "Sàbhail sgrìobhainn gu faidhle"
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "Sàbhail"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
+msgid "Stop the current scan"
+msgstr "Stad an sgana làithreach"
+
+#: ../data/simple-scan.ui.h:65
+msgid "Stop"
+msgstr "Stad"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: ../data/simple-scan.ui.h:67
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Cuairtich clì an duilleag (tuathal)"
+
+#. Label on rotate page left (anti-clockwise) item
+#: ../data/simple-scan.ui.h:69
+msgid "Rotate Left"
+msgstr "Cuairtich Clì"
+
+#. Tooltip for rotate right (clockwise) button
+#: ../data/simple-scan.ui.h:71
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Cuairtich deas an duilleag (deasail)"
+
+#. Label on rotate page right (clockwise) item
+#: ../data/simple-scan.ui.h:73
+msgid "Rotate Right"
+msgstr "Cuairtich Deas"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "Buain an duilleag taghta"
+
+#: ../data/simple-scan.ui.h:75
+msgid "Crop"
+msgstr "Buain"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:77
+msgid "_Username for resource:"
+msgstr "_Ainm-cleachdaiche son goireas:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:79
+msgid "_Password:"
+msgstr "_Facal faire:"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:81
+msgid "_Authorize"
+msgstr "_Ùghdarraich"
+
+#. Title of preferences dialog
+#: ../data/simple-scan.ui.h:83
+msgid "Preferences"
+msgstr "Roghainnean"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:85
+msgid "Scan S_ource:"
+msgstr "Sgana B_un-tùs:"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:87
+msgid "_Text Resolution:"
+msgstr "_Teacsa Dùmhlachd-Bhreacaidh:"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:89
+msgid "_Photo Resolution:"
+msgstr "_Dealbh Dùmhlachd-Bhreacaidh:"
+
+#. Label beside scan side combo box
+#: ../data/simple-scan.ui.h:91
+msgid "Scan Side:"
+msgstr "Sgana Taobh:"
+
+#. Label beside page size combo box
+#: ../data/simple-scan.ui.h:93
+msgid "Page Size:"
+msgstr "Meud Duilleag:"
+
+#. Label beside brightness scale
+#: ../data/simple-scan.ui.h:95
+msgid "Brightness:"
+msgstr ""
+
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr ""
+
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr ""
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "Beulaibh agus Cùlaibh"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "Beulaibh"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "Air ais"
+
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "Sganaich Sgrìobhainn"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "Leud uinneag ann am piosgailean"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "Àirde uinneag ann am piosgailean"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "FÌOR ma tha uinneag a'phrògram tur-àrdachadh"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "Innleachd do sganaich bho"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+msgid "SANE device to acquire images from."
+msgstr "Innleachd SANE son faighinn ìomhaighean bho."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "A seòrsa sgrìobhainn ga sganadh"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"A seòrsa sgrìobhainn ga sganadh. Tha suidheachadh seo rèiticheadh dùmhlachd-"
+"bhreacaidh air a sgana, dathan agus an dèidh-giullachd."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "A' chùrsa sgana"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "Cùrsa a sganair tharis an duilleag tha sganadh."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "Leud den sganadh ìomhaigh ann am piosgailean"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
+msgid ""
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
+msgstr ""
+"A leud den sganadh ìomhaigh ann am piosgailean. Tha luach seo ùrachadh gu an "
+"sganadh duilleag\r\n"
+"mu dheireadh."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "Àirde den sganadh ìomhaigh ann am piogsailean"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
+msgid ""
+"The height of scanned image in pixels. This value is updated to what the "
+"last scanned page was."
+msgstr ""
+"Àirde sganadh den ìomhaigh ann an piogsailean. Tha luach seo ùrachadh gu an "
+"sganadh duilleag mu dheireadh."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "Leud am pàipear ann a deicheamhaich de mm"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"leud am pàipear ann a deicheamhaich de mm (no 0 son lorg-paipear fèin-"
+"obrachail)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "Àirde am paipear ann a deicheamhaich de mm"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Àirde am paipear ann deicheamhaich de mm (no 0 son lorg-paipear fèin-"
+"obrachail)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "Dùmhlachd-bhreacaidh ìomhaigh air sganaich mu dheireadh"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
+msgid "The resolution in dots-per-inch of the previously scanned image."
+msgstr ""
+"Dùmhlachd-bhreacaidh ann a dotagan-gach-diog de sganadh ìomhaigh mar-tha."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "Dùmhlachd-bhreacaidh son sganaichean teacsa"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "Dùmhlachd-bhreacaidh ann a dotagan-gach-diog nuair sganadh teacsa."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "Dùmhlachd-bhreacaidh son sganaichean dealbh"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "Dùmhlachd-bhreacaidh ann a dotagan-gach-diog nuair sganadh dealbhan."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "Taobh duilleag ri sganaich"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "An taobh duilleag a sganadh."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "Eòlaire do shàbhail faidhlichean gu"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"An eòlaire gu sàbhail faidhlichean do. Gnàthachadh gu eòlaire na "
+"sgrìobhainnean ma seadha 's nach eil e stèidhichte."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr ""
+
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:814
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Gun sganairean ri làimh, Ceangal sibh sganair."
+
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:844
+msgid "Unable to connect to scanner"
+msgstr "Cha b'urrain ceangal gu sganair."
+
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1207
+msgid "Unable to start scan"
+msgstr "Cha b'urrain tòiseachadh sgana"
+
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+msgid "Error communicating with scanner"
+msgstr "Mearachd rùn-phàirteachadh le sganair"
+
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Seall tionndadh an sgaoilidh"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Clò-bhuail teachdaireachdan dì-bhugachadh"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+"Càirich faidhlichean PDF chrùthachadh le tionndaidhean aosda de Simple Scan"
+
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:297
+msgid "Failed to scan"
+msgstr "D'fhàilig a sganadh"
+
+#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
+#: ../src/simple-scan.vala:316
+msgid "Scanned Document"
+msgstr "Sganadh Sgrìobhainn"
+
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[Innleachd...] - Goireas Sganadh"
+
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
+#, c-format
+msgid "Run '%s --help' to see a full list of available command line options."
+msgstr ""
+"Ruith '%s --help' son faicinn làn liosta roghainnean loidhne-àithne ri làimh."
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "Sganadh Sgrìobhainn.pdf"
+
+#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
+#: ../src/ui.vala:159
+#, c-format
+msgid "Username and password required to access '%s'"
+msgstr "Ainm-cleachdaiche agus facal-faire iarrtas ruigsinneachd '%s'"
+
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:202
+msgid "No scanners detected"
+msgstr "Gun sganairean air lorg"
+
+#. Hint to user on why there are no scanners detected
+#: ../src/ui.vala:204
+msgid "Please check your scanner is connected and powered on"
+msgstr "Sgrùd sibh gu bheil sganair agaibh ceangailt agus a' chumhachd air"
+
+#. Save dialog: Dialog title
+#: ../src/ui.vala:363
+msgid "Save As..."
+msgstr "Sàbhail Mar..."
+
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:377
+msgid "Image Files"
+msgstr "Faidhlichean Ìomhaigh"
+
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:383
+msgid "All Files"
+msgstr "Faidhlichean gu lèir"
+
+#. 
+#: ../src/ui.vala:388
+msgid "Select File _Type"
+msgstr "Tagh Faidhle _Seòrsa"
+
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF {sgrìobhainn ioma-duilleag}"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (peinntealta)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (lossless)"
+
+#. Title of error dialog when save failed
+#: ../src/ui.vala:503
+msgid "Failed to save file"
+msgstr "D'fhàilig sàbhail gu faidhle"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:526
+msgid "If you don't save, changes will be permanently lost."
+msgstr "Mar 's e nach sàbhail thu, chailleadh atharraichean gu maireannach."
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:563
+msgid "Save current document?"
+msgstr "Sàbhail sgrìobhainn làithreach?"
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:565
+msgid "Discard Changes"
+msgstr "Tilg às atharraichean"
+
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "Cha b'urrain sàbhail ìomhaigh airson ro-shealladh"
+
+#. Error message display when unable to preview image
+#: ../src/ui.vala:872
+msgid "Unable to open image preview application"
+msgstr "Cha b'urrain fosgail prògram ro-shealladh ìomhaigh"
+
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1119
+msgid "Unable to open help file"
+msgstr "Cha b`urrain fosgail faidhle cobhair"
+
+#. The license this software is under (GPL3+)
+#: ../src/ui.vala:1130
+msgid ""
+"This program is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 3 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program.  If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+"Prògram bathar-bog saorsail tha seo: Faodaidh tu sgaoileadh e agus/no "
+"atharraich \n"
+"e fo teirmichean Ceadachas Poblach Coitcheann GNU mar dh'foillsicheadh le\n"
+"Fonndas Bathar-bog Saorsail (FSF) an dàrna cuid dreachd 3 den Ceadachas, no\n"
+"(do thaghadh fhèin) dreachd sam bith nas anmoch.\n"
+"\n"
+"Tha am prògram seo air sgaoileadh ann an dòchas gum bi e feumail,\n"
+"ach GUN BARRANTAS SAM BITH: às aonais no fuis ri thuigse barrantas de\n"
+"MARSANTACHD no ION-FHREAGARRACHD OBRACHAIDH. Faic an\n"
+"GNU Ceadachas Poblach Coitcheann son barrachd fiosrachd.\n"
+"\n"
+"Bu chòir dhut fhaighinn leth-bhreac den GNU Ceadachas Poblach Coitcheann\n"
+"còmhla leis am prògram seo. 'S mar nach d'fhuair faic "
+"<http://www.gnu.org/licenses/>."
+
+#. Title of about dialog
+#: ../src/ui.vala:1133
+msgid "About Simple Scan"
+msgstr "Mu dheidhinn Simple Scan"
+
+#. Description of program
+#: ../src/ui.vala:1136
+msgid "Simple document scanning tool"
+msgstr "Inneal sganadh sgrìobhainn simplidh"
+
+#: ../src/ui.vala:1145
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  alasdair caimbeul https://launchpad.net/~alexd"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1156
+msgid "Save document before quitting?"
+msgstr "Sàbhail sgrìobhainn ro fàgail?"
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1158
+msgid "Quit without Saving"
+msgstr "Fàg gun Sàbhail"
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dgò (bunaiteach)"
+
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1292
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d dgò (dreachd)"
+
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1295
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d dgò (dùmhlachd-bhreacaidh àrd)"
+
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
+#, c-format
+msgid "%d dpi"
+msgstr "%d dgò"
+
+#. Title of dialog when cannot load required files
+#: ../src/ui.vala:1333
+msgid "Files missing"
+msgstr "Faidhlichean a dhìth"
+
+#. Description in dialog when cannot load required files
+#: ../src/ui.vala:1335
+msgid "Please check your installation"
+msgstr "Sgrùd sibh a stàladh agaibh"
+
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1403
+msgid "Change _Scanner"
+msgstr "Atharraich _Sganair"
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1409
+msgid "Automatic"
+msgstr "Fèin-sheòlaidh"
+
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr ""
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr ""
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr ""
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr ""
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr ""
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr ""
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "A' sàbhaladh sgrìobhainn..."
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "A' sàbhaladh duilleag %d a-mach a %d"
diff --git a/po/gl.po b/po/gl.po
index 03f8421..009c308 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,570 +7,594 @@ msgid ""
 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-27 16:10+0000\n"
-"Last-Translator: Manuel Xosé Lemos <Unknown>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-07-23 09:01+0000\n"
+"Last-Translator: Robert Ancell <robert.ancell@canonical.com>\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-10-22 04:47+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:45+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Escaner sinxelo"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr "A_4"
+msgid "_Document"
+msgstr "_Documento"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr "Esc_anear"
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "Única _páxina"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:10
 msgid "All Pages From _Feeder"
 msgstr "Todas as páxinas do _alimentador"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr "Atrás"
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
-msgstr "Recortar"
+msgid "_Stop Scan"
+msgstr "_Deter o escaneado"
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr "Recortar a páxina seleccionada"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr "Anverso"
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr "Anverso e reverso"
-
-#. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr "Le_gal"
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr "Novo"
-
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr "Tamaño da páxina:"
+msgid "Text"
+msgstr "Texto"
 
 #. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
+#: ../data/simple-scan.ui.h:16
 msgid "Photo"
 msgstr "Fotografía"
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr "Preferencias"
-
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
-msgstr "Rotar á esquerda"
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr "Correo-_e"
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr "Rotar á dereita"
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr "_Páxina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
+#: ../data/simple-scan.ui.h:22
 msgid "Rotate _Left"
 msgstr "Rotar á _esquerda"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
+#: ../data/simple-scan.ui.h:24
 msgid "Rotate _Right"
 msgstr "Rotar á _dereita"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Xirar a páxina á esquerda (sentido contrario ao reloxo)"
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "_Recortar"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Xirar a páxina á dereita (sentido do reloxo)"
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "_Ningunha"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
 
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "_Carta"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "Le_gal"
+
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr "Gardar"
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr "Gardar o documento nun ficheiro"
+msgid "_Custom"
+msgstr "_Personalizado"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr "Esc_anear"
+msgid "_Rotate Crop"
+msgstr "_Rotar o recorte"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
-msgstr "Escanear"
+msgid "Move Left"
+msgstr ""
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr "Escanear _orixe"
+msgid "Move Right"
+msgstr ""
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr "Cara a escanear:"
+msgid "_Help"
+msgstr "_Axuda"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
-msgstr "Escanear unha única páxina desde o escaner"
-
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr "Escaner sinxelo"
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr "Única _páxina"
+msgid "_Contents"
+msgstr "_Contidos"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
 msgstr "Iniciar un novo documento"
 
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "Novo"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "Escanear unha única páxina desde o escaner"
+
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
-msgstr "Deter"
+msgid "Scan"
+msgstr "Escanear"
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr "Gardar o documento nun ficheiro"
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "Gardar"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
 msgid "Stop the current scan"
 msgstr "Deter o escaneo actual"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr "Texto"
-
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr "_Autorizar"
+msgid "Stop"
+msgstr "Deter"
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
-msgstr "_Contidos"
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Xirar a páxina á esquerda (sentido contrario ao reloxo)"
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr "Re_cortar"
+msgid "Rotate Left"
+msgstr "Rotar á esquerda"
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr "_Personalizado"
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Xirar a páxina á dereita (sentido do reloxo)"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr "_Documento"
+msgid "Rotate Right"
+msgstr "Rotar á dereita"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "Recortar a páxina seleccionada"
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
-msgstr "Correo-_e"
+msgid "Crop"
+msgstr "Recortar"
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr "_Axuda"
+msgid "_Username for resource:"
+msgstr "Nome de _usuario para o recurso:"
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr "_Carta"
+msgid "_Password:"
+msgstr "_Contrasinal:"
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr "_Ningunha"
+msgid "_Authorize"
+msgstr "_Autorizar"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr "_Páxina"
+msgid "Preferences"
+msgstr "Preferencias"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr "_Contrasinal:"
+msgid "Scan S_ource:"
+msgstr "_Orixe de escaneo:"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
-msgstr "Resolución _fotográfica:"
+msgid "_Text Resolution:"
+msgstr "Resolución de _texto:"
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr "_Rotar o recorte"
+msgid "_Photo Resolution:"
+msgstr "Resolución _fotográfica:"
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
-msgstr "_Deter o escaneado"
+msgid "Scan Side:"
+msgstr "Cara a escanear:"
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
-msgstr "Resolución de _texto:"
+msgid "Page Size:"
+msgstr "Tamaño da páxina:"
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
-msgstr "Nome de _usuario para o recurso:"
+msgid "Brightness:"
+msgstr "Brillo:"
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
-msgstr "Escanear documentos"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr "Contraste:"
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
-msgstr "Dispositivo desde o que escanear"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr "Calidade:"
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
-msgstr "Dirección de escaneado"
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "Anverso e reverso"
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
-msgstr "Directorio no que gardar os ficheiros"
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "Anverso"
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
-msgstr "Altura do papel en décimas de mm"
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "Atrás"
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr "Altura da imaxe escaneada en píxeles"
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "Escanear documentos"
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
-msgstr "Cara da páxina a escanear"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "Largura da xanela en píxeles"
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
-msgstr "Resolución para o escaneado de fotos"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "Altura da xanela en píxeles"
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
-msgstr "Resolución para o escaneado de texto"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "VERDADEIRO se a xanela do aplicativo está maximizada"
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
-msgstr "Resolución da última imaxe escaneada"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "Dispositivo desde o que escanear"
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
 msgstr "Dispositivo SANE desde o que adquirir as imaxes."
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
-msgstr "VERDADEIRO se a xanela do aplicativo está maximizada"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "Tipo de documento que está sendo escaneado"
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
-"A dirección do escáner a través da páxina escaneada. Pode ser calquera dos "
-"seguintes: «top-to-bottom» «bottom-to-top» «left-to-right» «right-to-left»"
+"Tipo de documento a escanear. Esta opción decide a resolución, cores e post-"
+"procesado do escaneado"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "Dirección de escaneado"
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "A dirección do escáner sobre a páxina escaneada."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "Largura da imaxe escaneada"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
 msgstr ""
-"O directorio no que se gardarán os ficheiros. Por omisión usarase o "
-"directorio de documentos."
+"A largura da imaxe escaneada. Este valor actualizase co que tivo a última "
+"páxina escaneada."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "Altura da imaxe escaneada en píxeles"
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
 msgstr ""
-"A altura da imaxe escaneada. Este valor actualizase co que tuvo a última "
+"A altura da imaxe escaneada. Este valor actualizase co que tivo a última "
 "páxina escaneada."
 
-#: ../data/simple-scan.schemas.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "Largura do papel en décimas de mm"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
-"A altura do papel en décimas de mm (ou 0 para a detección automática do "
+"A largura do papel en décimas de mm (ou 0 para a detección automática do "
 "papel)."
 
-#: ../data/simple-scan.schemas.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "Altura do papel en décimas de mm"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
 msgstr ""
-"A cara da páxina que desexe escanear. Pode ser un dos seguintes: «ambos», "
-"«anverso» e «recverso»"
+"A altura do papel en décimas de mm (ou 0 para a detección automática do "
+"papel)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr "Brillo do escaneo"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Axuste de brillo de -100 a 100 (0 é ningún)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr "Contraste do escaneo"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Axuste de contraste de -100 a 100 (0 é ningún)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "Resolución da última imaxe escaneada"
 
-#: ../data/simple-scan.schemas.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
 msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr "Resolución en puntos por polgada da imaxe escaneada anteriormente."
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "Resolución en puntos por polgada a usar cando se escanean fotos."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "Resolución para o escaneado de texto"
 
-#: ../data/simple-scan.schemas.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "Resolución en puntos por polgada a usar cando se escanean textos."
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"A largura da imaxe escaneada. Este valor actualizase co que tuvo a última "
-"páxina escaneada."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "Resolución para o escaneado de fotos"
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"A largura do papel en décimas de mm (ou 0 para a detección automática do "
-"papel)."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "Resolución en puntos por polgada a usar cando se escanean fotos."
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
-msgstr "Tipo de documento que está sendo escaneado"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "Cara da páxina a escanear"
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
-msgstr ""
-"O tipo de documento que se vai a escanear. «text» para documentos de texto, "
-"«photo» para fotos. Esta opción determina a resolución, as cores e o "
-"postprocesamento do escaneado."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "O lado da páxina a escanear."
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
-msgstr "Largura do papel en décimas de mm"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "Directorio no que gardar os ficheiros"
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
-msgstr "Largura da imaxe escaneada"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"O directorio no que se gardarán os ficheiros. Por omisión usarase o "
+"directorio de documentos."
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
-msgstr "Altura da xanela en píxeles"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr "Valor de calidade a usar na compresión JPEG"
 
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
-msgstr "Largura da xanela en píxeles"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr "Valor de calidade a usar na compresión JPEG."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Non hai escáneres dispoñíbeis. Conecte un escáner."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
-msgstr "Non foi posíbel conectar co escaner"
+msgstr "Non foi posíbel conectar co escáner"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
-msgstr "Non foi posíbel iniciar o escaneo"
+msgstr "Non foi posíbel iniciar o escaneado"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
-msgstr "Produciuse un erro na comunicación co escaner"
+msgstr "Produciuse un erro na comunicación co escáner"
+
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Mostrar a versión de publicación"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Mostrar mensaxes de depuración"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr "Arranxar ficheiros PDF xerados con versións antigas de Simple Scan"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
 msgstr "Produciuse un fallo ao escanear"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
 msgstr "Documento escaneado"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
-msgstr ""
-"Uso:\n"
-"  %s [DISPOSITIVO...] - Utilidade de escaneo"
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[DISPOSITIVO...] - Utilidade de escaneado"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
+msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
-"Opcións de axuda:\n"
-"  -d, --debug                     Mostra as mensaxes de depuración\n"
-"  -v, --version                   Mostra a versión\n"
-"  -h, --help                      Mostra as opcións de axuda\n"
-"  --help-all                      Mostra todas as opcións de axuda\n"
-"  --help-gtk                      Mostra as opcións de GTK+"
-
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
-#, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
-msgstr ""
-"Opcións de GTK+:\n"
-"  --class=CLASS                   Clase do programa tal como é usada polo "
-"xestor de xanelas.\n"
-"  --name=NAME                     Nome do programa tal como é usado polo "
-"xestor de xanelas.\n"
-"  --screen=SCREEN                 Pantalla X a usar\n"
-"  --sync                          Facer chamadas X síncronas\n"
-"  --gtk-module=MODULES            Cargar módulos GTK+ adicionais\n"
-"  --g-fatal-warnings              Facer todos os avisos en erros fatais"
+"Ejecute «%s --help» para ver unha lista completa das opcións de liña de "
+"ordes dispoñíbeis."
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "Document.pdf escaneado"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
-msgstr "Requírese o nome de usuario e contrasinal para acceder a '%s'"
+msgstr "Requírese o nome de usuario e o contrasinal para acceder a «%s»"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
-msgstr "Non se puido detectar os escáneres"
+msgstr "Non se detectou ningún escáner"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
 msgstr "Verifique que o seu escáner está conectado e aceso"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr "PDF (documento de múltiples páxinas)"
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr "JPEG (comprimido)"
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr "PNG (sen perdas)"
-
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
 msgstr "Gardar como..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
 msgstr "Ficheiros de imaxes"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
 msgstr "Todos os ficheiros"
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
 msgstr "Elixa o _tipo de ficheiro"
 
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF (documento de múltiples páxinas)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (comprimido)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (sen perdas)"
+
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
 msgstr "Produciuse un fallo ao gardar o ficheiro"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Se non garda o ficheiro, os seus cambios perderanse permanentemente."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
 msgstr "Gardar o documento actual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
 msgstr "Rexeitar os cambios"
 
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "Non foi posíbel gardar a imaxe da miniatura"
+
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
 msgstr "Non se pode abrir o aplicativo de vista previa da imaxe"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
 msgstr "Non é posíbel abrir o ficheiro de axuda"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -599,76 +623,182 @@ msgstr ""
 "con este programa. Si no fuera así, vea <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
 msgstr "Acerca de Simple Scan"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
-msgstr "Ferramenta sinxela de escaneo de documentos"
+msgstr "Ferramenta sinxela de escaneado de documentos"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Fran Diéguez https://launchpad.net/~frandieguez\n"
-"  Manuel Xosé Lemos https://launchpad.net/~mxlemos"
+"  Manuel Xosé Lemos https://launchpad.net/~mxlemos\n"
+"  Marcos Lans https://launchpad.net/~markooss\n"
+"  Miguel Anxo Bouzada https://launchpad.net/~mbouzada\n"
+"  Robert Ancell https://launchpad.net/~robert-ancell"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
 msgstr "Gardar o documento antes de saír?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
 msgstr "Saír sen gardar"
 
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d ppp (predeterminada)"
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#: ../src/ui.vala:1292
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (borrador)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
-#, c-format
-msgid "%d dpi"
-msgstr "%d ppp"
-
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d ppp (alta resolución)"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
-msgstr "%d ppp (predeterminada)"
+msgid "%d dpi"
+msgstr "%d ppp"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
 msgstr "Faltan ficheiros"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
 msgstr "Comprobe a súa instalación"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
 msgstr "Cambiar o _escáner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
-msgstr "Document.pdf escaneado"
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr "Máis escuro"
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr "Máis claro"
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr "Menos"
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr "Máis"
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr "Mínimo"
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr "Máximo"
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "Gardando o documento..."
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "Gardando páxina %d de %d"
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "Uso:\n"
+#~ "  %s [DISPOSITIVO...] - Utilidade de escaneo"
+
+#~ msgid ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ msgstr ""
+#~ "A dirección do escáner a través da páxina escaneada. Pode ser calquera dos "
+#~ "seguintes: «top-to-bottom» «bottom-to-top» «left-to-right» «right-to-left»"
+
+#~ msgid ""
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
+#~ msgstr ""
+#~ "O tipo de documento que se vai a escanear. «text» para documentos de texto, "
+#~ "«photo» para fotos. Esta opción determina a resolución, as cores e o "
+#~ "postprocesamento do escaneado."
+
+#, c-format
+#~ msgid ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+#~ msgstr ""
+#~ "Opcións de axuda:\n"
+#~ "  -d, --debug                     Mostra as mensaxes de depuración\n"
+#~ "  -v, --version                   Mostra a versión\n"
+#~ "  -h, --help                      Mostra as opcións de axuda\n"
+#~ "  --help-all                      Mostra todas as opcións de axuda\n"
+#~ "  --help-gtk                      Mostra as opcións de GTK+"
+
+#~ msgid ""
+#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ msgstr ""
+#~ "A cara da páxina que desexe escanear. Pode ser un dos seguintes: «ambos», "
+#~ "«anverso» e «recverso»"
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "Opcións de GTK+:\n"
+#~ "  --class=CLASS                   Clase do programa tal como é usada polo "
+#~ "xestor de xanelas.\n"
+#~ "  --name=NAME                     Nome do programa tal como é usado polo "
+#~ "xestor de xanelas.\n"
+#~ "  --screen=SCREEN                 Pantalla X a usar\n"
+#~ "  --sync                          Facer chamadas X síncronas\n"
+#~ "  --gtk-module=MODULES            Cargar módulos GTK+ adicionais\n"
+#~ "  --g-fatal-warnings              Converter todos os avisos en erros fatais"
diff --git a/po/he.po b/po/he.po
index e2f0f19..70b9260 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,323 +7,347 @@ msgid ""
 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-02-27 20:15+0000\n"
-"Last-Translator: Liel Fridman <Unknown>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-07-23 09:01+0000\n"
+"Last-Translator: Robert Ancell <robert.ancell@canonical.com>\n"
 "Language-Team: Hebrew <he@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-10-22 04:47+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:45+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "סריקה פשוטה"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr "A_4"
+msgid "_Document"
+msgstr "מ_סמך"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr "_סריקה"
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "עמוד _בודד"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:10
 msgid "All Pages From _Feeder"
-msgstr "כל העמודים מהמ_זין"
+msgstr "כל הדפים מהמ_זין"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr ""
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
-msgstr "חיתוך"
+msgid "_Stop Scan"
+msgstr "ע_צירת הסריקה"
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr "חיתוך העמוד שנבחר"
+msgid "Text"
+msgstr "טקסט"
 
-#. Combo box label for scanning the front side of a page
+#. Combo box label for photo scan mode
 #: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr ""
+msgid "Photo"
+msgstr "צילום"
 
-#. Combo box label for scanning both sides of a page
+#. Label on email menu item
 #: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr ""
+msgid "_Email"
+msgstr "_דוא״ל"
 
-#. Radio button for cropping to page to US legal size
+#. Page menu (contains action for each page, e.g. delete, crop)
 #: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr "_פוליו"
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr "חדש"
-
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr ""
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
-msgid "Photo"
-msgstr "תמונה"
-
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr "העדפות"
-
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
-msgstr "סיבוב שמאלה"
-
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr "סיבוב ימינה"
+msgid "_Page"
+msgstr "_עמוד"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
+#: ../data/simple-scan.ui.h:22
 msgid "Rotate _Left"
 msgstr "סיבוב _שמאלה"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
+#: ../data/simple-scan.ui.h:24
 msgid "Rotate _Right"
 msgstr "סיבוב _ימינה"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "סיבוב העמוד לשמאל (נגד כיוון השעון)"
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "_חיתוך"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr "סיבוב העמוד לימין (עם כיוון השעון)"
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "_ללא"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "_מכתב"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "_פוליו"
 
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr "שמירה"
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr ""
+msgid "_Custom"
+msgstr "ה_תאמה אישית"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr ""
+msgid "_Rotate Crop"
+msgstr "_סיבוב חיתוך"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
-msgstr "סריקה"
+msgid "Move Left"
+msgstr ""
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr "_מקור הסריקה:"
+msgid "Move Right"
+msgstr ""
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr ""
+msgid "_Help"
+msgstr "ע_זרה"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
-msgstr "סריקת עמוד בודד מהסורק"
-
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr "סריקה פשוטה"
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr "_עמוד בודד"
+msgid "_Contents"
+msgstr "_תוכן"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
 msgstr "התחלת מסמך חדש"
 
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "חדש"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "סריקת עמוד בודד מהסורק"
+
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
-msgstr "עצירה"
+msgid "Scan"
+msgstr "סריקה"
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr "שמירת המסמך לקובץ"
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "שמירה"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
 msgid "Stop the current scan"
 msgstr "עצירת הסריקה הנוכחית"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr "טקסט"
-
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr "_אישור"
+msgid "Stop"
+msgstr "עצירה"
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
-msgstr "_תכנים"
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "סיבוב העמוד לשמאל (נגד כיוון השעון)"
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr "_חיתוך"
+msgid "Rotate Left"
+msgstr "סיבוב שמאלה"
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr "_מותאם אישית"
+msgid "Rotate the page to the right (clockwise)"
+msgstr "סיבוב העמוד לימין (עם כיוון השעון)"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr "מ_סמך"
+msgid "Rotate Right"
+msgstr "סיבוב ימינה"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "חיתוך העמוד שנבחר"
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
-msgstr "_דוא\"ל"
+msgid "Crop"
+msgstr "חיתוך"
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr "ע_זרה"
+msgid "_Username for resource:"
+msgstr "_שם המשתמש עבור המשאב:"
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr "_מכתב"
+msgid "_Password:"
+msgstr "_ססמה:"
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr "_ללא"
+msgid "_Authorize"
+msgstr "_אימות"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr "_עמוד"
+msgid "Preferences"
+msgstr "העדפות"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr "_סיסמה:"
+msgid "Scan S_ource:"
+msgstr "_מקור הסריקה:"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
-msgstr "_רזולוציית התמונה:"
+msgid "_Text Resolution:"
+msgstr "ר_זולוציית הטקסט:"
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr "_סיבוב חיתוך"
+msgid "_Photo Resolution:"
+msgstr "_רזולוציית התמונה:"
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
-msgstr "_עצירת הסריקה"
+msgid "Scan Side:"
+msgstr "הצד הנסרק:"
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
-msgstr "רזולו_ציית הטקסט:"
+msgid "Page Size:"
+msgstr "מידות הדף:"
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
-msgstr "שם ה_משתמש עבור המשאב:"
+msgid "Brightness:"
+msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
-msgstr "סריקת מסמך"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
-msgstr "Device to scan from"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
-msgstr "Direction of scan"
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "גב וחזית"
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
-msgstr ""
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "חזית"
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
-msgstr ""
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "גב"
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr "Height of scanned image in pixels"
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "סריקת מסמכים"
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "Window width in pixels"
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
-msgstr "Resolution for photo scans"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "Window height in pixels"
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
-msgstr "Resolution for text scans"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "TRUE if the application window is maximized"
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
-msgstr "Resolution of last scanned image"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "Device to scan from"
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
 msgstr "SANE device to acquire images from."
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
-msgstr "TRUE if the application window is maximized"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "Type of document being scanned"
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "Direction of scan"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "The direction of the scanner across the scanned page."
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "Width of scanned image in pixels"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
 msgstr ""
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "Height of scanned image in pixels"
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
@@ -331,238 +355,244 @@ msgstr ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
 
-#: ../data/simple-scan.schemas.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "Width of paper in tenths of a mm"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
 
-#: ../data/simple-scan.schemas.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "Height of paper in tenths of a mm"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "Resolution of last scanned image"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
 msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr "The resolution in dots-per-inch of the previously scanned image."
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "The resolution in dots-per-inch to use when scanning photos."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "Resolution for text scans"
 
-#: ../data/simple-scan.schemas.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "The resolution in dots-per-inch to use when scanning text."
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "Resolution for photo scans"
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "The resolution in dots-per-inch to use when scanning photos."
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
-msgstr "Type of document being scanned"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "Page side to scan"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "The page side to scan."
 
-#: ../data/simple-scan.schemas.in.h:23
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "Directory to save files to"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
 msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
+"The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
+"The directory to save files to. Defaults to the documents directory if unset."
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
-msgstr "Width of scanned image in pixels"
-
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
-msgstr "Window height in pixels"
-
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
-msgstr "Window width in pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
-msgstr "אין סורקים זמינים. יש לחבר סורק."
+msgstr "אין סורקים זמינים. נא לחבר סורק."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
 msgstr "לא ניתן להתחבר לסורק"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
 msgstr "לא ניתן להתחיל בסריקה"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
-msgstr "שגיאה בהתקשרות עם הסורק"
+msgstr "אירעה שגיאה בעת ההתקשרות עם הסורק"
+
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Show release version"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Print debugging messages"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr "תיקון קובצי PDF שנוצרו באמצעות גרסאות ישנות יותר של Simple Scan"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
 msgstr "הסריקה נכשלה"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
 msgstr "מסמך שנסרק"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
-msgstr ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[DEVICE...] - Scanning utility"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
-#, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
-msgstr ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
-
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
+msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
+"Run '%s --help' to see a full list of available command line options."
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "מסמך סרוק.pdf"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
-msgstr "נדרשים שם משתמש וסיסמה כדי לגשת אל '%s'"
+msgstr "נדרשים שם משתמש וססמה כדי לגשת אל '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
-msgstr "לא זוהו סורקים"
+msgstr "לא נמצאו סורקים"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
 msgstr "יש לבדוק כי הסורק מחובר ומופעל"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr "PDF (מסמך מרובה עמודים)"
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr "JPEG (דחוס)"
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr "PNG (ללא אובדן דתונים)"
-
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
 msgstr "שמירה בשם..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
 msgstr "קובצי תמונה"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
 msgstr "כל הקבצים"
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
-msgstr "בחירת _סוג קובץ"
+msgstr "בחירת _סוג הקובץ"
+
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF (מסמך מרובה עמודים)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (דחוס)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (ללא אבדן נתונים)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
 msgstr "שמירת הקובץ נכשלה"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
-msgstr ""
+msgstr "ללא שמירה, השינויים יאבדו לעד."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
-msgstr ""
+msgstr "האם לשמור את המסמך הנוכחי?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
-msgstr ""
+msgstr "התעלמות מהשינויים"
+
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "לא ניתן לשמור את התמונה לתצוגה מקדימה"
 
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
-msgstr ""
+msgstr "לא ניתן לפתוח את היישום להצגה מקדימה של תמונות"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
 msgstr "לא ניתן לפתוח את קובץ העזרה"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -577,89 +607,195 @@ msgid ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
-"תוכנית זו היא תוכנה חופשית; אתה יכול להפיצה מחדש ו/או לשנות אותה על-פי תנאי "
-"הרישיון הציבורי הכללי של GNU כפי שפורסם על ידי קרן התוכנה החופשית; בין אם "
-"גרסה 2 של הרישיון, ובין אם (לפי בחירתך) כל גרסה מאוחרת שלו.\n"
+"תכנית זו היא תוכנה חופשית; באפשרותך יכול להפיצה מחדש ו/או לשנות אותה על-פי "
+"תנאי הרישיון הציבורי הכללי של GNU כפי שפורסם על ידי קרן התכנה החופשית; בין "
+"אם גרסה 3 של הרישיון, ובין אם (לפי בחירתך) כל גרסה מאוחרת שלו.\n"
 "\n"
-"תוכנית זו מופצת בתקווה שתהיה מועילה, אבל בלא אחריות כלשהי; ואפילו ללא "
-"האחריות המשתמעת בדבר מסחריותה או התאמתה למטרה מסויימת. לפרטים נוספים, ראה את "
-"הרישיון הציבורי הכללי של GNU.\n"
+"תכנית זו מופצת בתקווה שתהיה מועילה, אבל בלא אחריות כלשהי; ואפילו ללא האחריות "
+"המשתמעת בדבר מסחריותה או התאמתה למטרה מסוימת. לפרטים נוספים, ניתן לעיין "
+"ברישיון הציבורי הכללי של GNU.\n"
 "\n"
-"ביחד עם תוכנית זו היית אמור לקבל עותק של הרישיון הציבורי הכללי של GNU; במידה "
-"שלא, ניתן לעיין ב־<http://www.gnu.org/licenses/>."
+"לתכנית זו אמור להיות מצורף עותק של הרישיון הציבורי הכללי של GNU; במידה שלא, "
+"ניתן לעיין ב־<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
-msgstr "אודות Simple Scan"
+msgstr "על אודות Simple Scan"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
 msgstr "כלי פשוט לסריקת מסמכים"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
+"  Amit Yaron https://launchpad.net/~amityaron87\n"
 "  Ddorda https://launchpad.net/~ddorda\n"
+"  Dudu Edri https://launchpad.net/~duduedri96\n"
 "  Liel Fridman https://launchpad.net/~lielft\n"
+"  Robert Ancell https://launchpad.net/~robert-ancell\n"
+"  Shlomil https://launchpad.net/~shlomister\n"
 "  Yaron https://launchpad.net/~sh-yaron"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
-msgstr ""
+msgstr "האם לשמור את המסמך בטרם היציאה?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
-msgstr ""
+msgstr "לצאת ללא שמירה"
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (בררת מחדל)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#: ../src/ui.vala:1292
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (טיוטה)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
-#, c-format
-msgid "%d dpi"
-msgstr "%d dpi"
-
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (רזולוציה גבוהה)"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
-msgstr "%d dpi (ברירת מחדל)"
+msgid "%d dpi"
+msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
 msgstr "חסרים קבצים"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
 msgstr "יש לבדוק את ההתקנה"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
 msgstr "ב_חירה בסורק אחר"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
+msgstr "אוטומטי"
+
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
 msgstr ""
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
-msgstr "מסמך סרוק.pdf"
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr ""
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr ""
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr ""
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr ""
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr ""
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "המסמך נשמר...‏"
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "נשמר העמוד %d מתוך %d"
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+
+#~ msgid ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ msgstr ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+
+#~ msgid ""
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
+#~ msgstr ""
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
+
+#, c-format
+#~ msgid ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+#~ msgstr ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+
+#~ msgid ""
+#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ msgstr ""
+#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
diff --git a/po/hr.po b/po/hr.po
index 97435ec..ab32d78 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,537 +7,596 @@ msgid ""
 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-01-26 22:27+0000\n"
-"Last-Translator: Launchpad Translations Administrators "
-"<rosetta@launchpad.net>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-07-23 09:01+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Croatian <hr@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-10-22 04:48+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Jednostavno skeniranje"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr "A_4"
+msgid "_Document"
+msgstr "_Dokument"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr "Sk_eniraj"
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "Jedna _stranica"
 
 #. 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 "Sve stranice iz _uvlakača"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr ""
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
-msgstr ""
+msgid "_Stop Scan"
+msgstr "_Zaustavi skeniranje"
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr ""
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr ""
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr ""
-
-#. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr ""
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr ""
-
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr ""
+msgid "Text"
+msgstr "Tekst"
 
 #. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
+#: ../data/simple-scan.ui.h:16
 msgid "Photo"
 msgstr "Fotografija"
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr "Osobitosti"
-
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
-msgstr ""
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr "_E-pošta"
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr ""
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr "_Stranica"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
+#: ../data/simple-scan.ui.h:22
 msgid "Rotate _Left"
 msgstr "Rotiraj _lijevo"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
+#: ../data/simple-scan.ui.h:24
 msgid "Rotate _Right"
 msgstr "Rotiraj _desno"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr ""
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "_Izreži"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr ""
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "_Ništa"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
 
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "_Letter"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "Le_gal"
+
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr ""
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr ""
+msgid "_Custom"
+msgstr "_Prilagođeno"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr ""
+msgid "_Rotate Crop"
+msgstr "_Rotiraj isječak"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
-msgstr ""
+msgid "Move Left"
+msgstr "Pomakni ulijevo"
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr ""
+msgid "Move Right"
+msgstr "Pomakni udesno"
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr ""
+msgid "_Help"
+msgstr "_Pomoć"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
-msgstr ""
-
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr ""
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr ""
+msgid "_Contents"
+msgstr "_Sadržaj"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
-msgstr ""
+msgstr "Započni novi dokument"
+
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "Novo"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "Skeniraj jednu stranicu sa skenera"
 
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
-msgstr ""
+msgid "Scan"
+msgstr "Skeniraj"
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
-msgid "Stop the current scan"
-msgstr ""
+msgid "Save document to a file"
+msgstr "Spremi dokument u datoteku"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr "Tekst"
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "Spremi"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
+msgid "Stop the current scan"
+msgstr "Prekini trenutno skeniranje"
 
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr ""
+msgid "Stop"
+msgstr "Zaustavi"
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
-msgstr ""
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Zaokreni stranicu ulijevo (obrnuto od kazaljke na satu)"
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr "_Izreži"
+msgid "Rotate Left"
+msgstr "Zaokreni ulijevo"
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr "_Prilagođeno"
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Zaokreni stranicu udesno (u smjeru kazaljke na satu)"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr "_Dokument"
+msgid "Rotate Right"
+msgstr "Zaokreni udesno"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "Izreži odabranu stranicu"
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
-msgstr ""
+msgid "Crop"
+msgstr "Izreži"
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr "_Pomoć"
+msgid "_Username for resource:"
+msgstr "_Korisničko ime za izvor:"
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr "_Letter"
+msgid "_Password:"
+msgstr "_Lozinka:"
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr "_Ništa"
+msgid "_Authorize"
+msgstr "_Ovlasti"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr "_Stranica"
+msgid "Preferences"
+msgstr "Osobitosti"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr "_Lozinka:"
+msgid "Scan S_ource:"
+msgstr "_Izvor skeniranja:"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
-msgstr ""
+msgid "_Text Resolution:"
+msgstr "_Rezolucija teksta:"
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr ""
+msgid "_Photo Resolution:"
+msgstr "_Rezolucija slike"
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
-msgstr ""
+msgid "Scan Side:"
+msgstr "Stranica skeniranja:"
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
-msgstr ""
+msgid "Page Size:"
+msgstr "Veličina stranice:"
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
+msgid "Brightness:"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
-msgstr ""
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "Prednje i stražnje"
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
-msgstr ""
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "Prednje"
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
-msgstr ""
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "Natrag"
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr ""
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "Skenirajte dokumente"
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "Širina prozora u pikselima"
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "Visina prozora u pikselima"
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "ISTINA ako je prozor aplikacije maksimalan"
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "Uređaj za skeniranje"
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
-msgstr ""
+msgstr "SANE uređaj iz kojeg se dobiva slika."
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "Vrsta dokumenat koji se skenira"
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
+"Vrsta dokumenta koji se skenira. Ova postavka određuje razlučivost, boju i "
+"naknadnu obradu."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "Smjer skeniranja"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "Smjer skenera preko skenirane stranice."
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "Širina skenirane slike u pikselima"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
 msgstr ""
+"Širina skenirane slike u pikselima. Ova vrijednost se ažurira na vrijednost "
+"zadnje skenirane stranice."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "Visina skenirane slike u pikselima"
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
 msgstr ""
+"Visina skenirane slike u pikselima. Ova vrijednost se ažurira na vrijednost "
+"zadnje skenirane stranice."
 
-#: ../data/simple-scan.schemas.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "Širina papira u desetinkama milimetra"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
+"Širina papira u desetinkama milimetra (ili 0 za automatsko prepoznavanje "
+"papira)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "Visina papira u desetinkama milimetra"
 
-#: ../data/simple-scan.schemas.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
 msgstr ""
+"Visina papira u desetinkama milimetra (ili 0 za automatsko prepoznavanje "
+"papira)."
 
-#: ../data/simple-scan.schemas.in.h:17
-msgid "The resolution in dots-per-inch of the previously scanned image."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:19
-msgid "The resolution in dots-per-inch to use when scanning text."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "Rezolucija zadnje skenirane slike"
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
+msgid "The resolution in dots-per-inch of the previously scanned image."
+msgstr "Rezolucija u točkama po inču prethodno skenirane slike."
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "Rezolucija za skeniranje teksta"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
+"Rezolucija u točkama po inču za korištenje prilikom skeniranja teksta."
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "Rezolucija za skeniranje fotografija"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
+"Rezolucija u točkama po inču za korištenje prilikom skeniranja slika."
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "Strana lista za skeniranje"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "Strana stranice za skeniranje."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "Direktorij za pohranu datoteka"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
+"Direktorij za pohranu datoteka. Ako nije postavljeno, koristi se direktorij "
+"dokumenata."
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
-msgstr ""
+msgstr "Nema dostupnih skenera. Molim spojite skener."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
-msgstr ""
+msgstr "Nije moguće povezati se na skener"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
-msgstr ""
+msgstr "Početak skeniranja nije moguć"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
-msgstr ""
+msgstr "Greška pri komunikaciji sa skenerom"
+
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Prikaži inačicu izdanja"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Ispiši poruke ispravljanja grešaka"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr "Popravi PDF datoteke koje je generirala starija inačica Simple Scana"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
-msgstr ""
+msgstr "Neuspjelo skeniranje"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
-msgstr ""
+msgstr "Skenirani dokument"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
-msgstr ""
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[UREĐAJ...] - Alat za skeniranje"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
+msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
+"Pokrenite '%s --help'  kako biste vidjeli potpunu listu dostupnih mogućnosti "
+"naredbenog retka."
 
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
-#, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
-msgstr ""
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "Skenirani dokument.pdf"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
-msgstr ""
+msgstr "Korisničko ime i lozinka su potrebni za pristup '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
-msgstr ""
+msgstr "Niti jedan skener nije otkriven"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
-msgstr ""
-
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr ""
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr ""
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr ""
+msgstr "Molim provjerite je li skener spojen i uključen"
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
 msgstr "Spremi kao..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
-msgstr ""
+msgstr "Slikovne datoteke"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
-msgstr ""
+msgstr "Sve datoteke"
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
-msgstr ""
+msgstr "Odaberite _vrstu datoteke"
+
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF (dokument od više stranica)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (komprimirano)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (bez gubitaka)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
-msgstr ""
+msgstr "Neuspjelo pohranjivanje datoteke"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
-msgstr ""
+msgstr "Ako ne spremite, promjene će biti trajno izgubljene."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
-msgstr ""
+msgstr "Pohraniti trenutni dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
-msgstr ""
+msgstr "Odbaci promjene"
+
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "Spremanje slike za pretpregled nije uspjelo"
 
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
-msgstr ""
+msgstr "Nije moguće otvoriti program za pregled slike"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
-msgstr ""
+msgstr "Nije moguće otvoriti datoteku pomoći"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -552,77 +611,194 @@ msgid ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
+"This program is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 3 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
-msgstr ""
+msgstr "O jednostavnom skeniranju"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
-msgstr ""
+msgstr "Alat za jednostavno skeniranje"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Ante Karamatić https://launchpad.net/~ivoks"
+"  Ante Karamatić https://launchpad.net/~ivoks\n"
+"  Launchpad Translations Administrators https://launchpad.net/~rosetta\n"
+"  Renato Kalanj https://launchpad.net/~renato-kalanj\n"
+"  Saša Teković https://launchpad.net/~hseagle2015\n"
+"  Tina Kružić https://launchpad.net/~tina-kruzic\n"
+"  jfk- https://launchpad.net/~jfk-\n"
+"  student4 https://launchpad.net/~iputnik-msn"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
-msgstr ""
+msgstr "Pohraniti dokument prije prekida rada?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
-msgstr ""
+msgstr "Prekini bez spremanja"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
 #, c-format
-msgid "%d dpi (draft)"
-msgstr ""
+msgid "%d dpi (default)"
+msgstr "%d dpi (zadano)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1292
 #, c-format
-msgid "%d dpi"
-msgstr ""
+msgid "%d dpi (draft)"
+msgstr "%d dpi (nacrt)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
-msgstr ""
+msgstr "%d dpi (visoka rezolucija)"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
-msgstr ""
+msgid "%d dpi"
+msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
-msgstr ""
+msgstr "Nedostaju datoteke"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
-msgstr ""
+msgstr "Molim provjerite vašu instalaciju"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
-msgstr ""
+msgstr "Promjeni _Skener"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
+msgstr "Automatski"
+
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
 msgstr ""
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr ""
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr ""
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr ""
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr ""
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
 msgstr ""
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr ""
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr ""
+
+#~ msgid ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ msgstr ""
+#~ "Smjer skenera preko skeniranih stranica. Može biti: 's vrha na dno' 's dna "
+#~ "na vrh' 's lijeva na desno \",\" s desna na lijevo \""
+
+#~ msgid ""
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
+#~ msgstr ""
+#~ "Vrsta dokumenata koji se skenira. 'tekst' za tekstualne dokumente, 'slika' "
+#~ "za slike. Ova postavka odlučuje o rezoluciji skeniranja, boji i obradi nakon "
+#~ "skeniranja."
+
+#, c-format
+#~ msgid ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+#~ msgstr ""
+#~ "Pomoćne opcije:\n"
+#~ "  -d, --debug Ispiši poruke za debuggiranje\n"
+#~ "  -v, --version Prikaži verziju programa\n"
+#~ "  -h, --help Prikaži pomoćne opcije\n"
+#~ "  --help-all Prikaži sve pomoćne opcije\n"
+#~ "  --help-gtk Prikaži GTK+ opcije"
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "Upotreba:\n"
+#~ "  %s [UREĐAJ...] - Korist skeniranja"
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "GTK+ Opcije:\n"
+#~ "  --class=CLASS Klasa programa koju koristi upravitelj prozora\n"
+#~ "  --name=NAME Ime programa koji koristi upravitelj prozora\n"
+#~ "  --screen=SCREEN X zaslon za korištenje\n"
+#~ "  --sync Učinite X pozive sinkroniziranima\n"
+#~ "  --gtk-module=MODULES Učitavanje dodatnih GTK+ modula\n"
+#~ "  -g-fatal-warnings Učinite sva upozorenja kobnima"
+
+#~ msgid ""
+#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ msgstr "Strana lista za skeniranje. Može biti: 'obje' 'prednja' 'stražnja'"
diff --git a/po/hu.po b/po/hu.po
index 76ff8fe..6efd7b6 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,326 +7,347 @@ msgid ""
 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-15 07:36+0000\n"
-"Last-Translator: Richard Somlói <level@somloirichard.hu>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-07-23 09:02+0000\n"
+"Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n"
 "Language-Team: Hungarian <hu@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-10-22 04:47+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:45+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Simple Scan"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr "A_4"
+msgid "_Document"
+msgstr "_Dokumentum"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr "Sz_kennelés"
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "Egy _oldal"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:10
 msgid "All Pages From _Feeder"
 msgstr "Minden oldal az _olvasóból"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr "Hátlap"
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
-msgstr "Kivágás"
+msgid "_Stop Scan"
+msgstr "_Szkennelés megállítása"
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr "A kiválasztott oldal levágása"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr "Előlap"
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr "Előlap és hátlap"
-
-#. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr "Le_gal"
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr "Új"
-
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr "Oldalméret:"
+msgid "Text"
+msgstr "Szöveg"
 
 #. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
+#: ../data/simple-scan.ui.h:16
 msgid "Photo"
 msgstr "Fénykép"
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr "Beállítások"
-
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
-msgstr "Forgatás balra"
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr "_E-mail"
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr "Forgatás jobbra"
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr "_Oldal"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
+#: ../data/simple-scan.ui.h:22
 msgid "Rotate _Left"
 msgstr "Forgatás b_alra"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
+#: ../data/simple-scan.ui.h:24
 msgid "Rotate _Right"
 msgstr "Forgatás _jobbra"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Az oldal elforgatása balra (óra járásával ellentétesen)"
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "_Kivágás"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Az oldal elforgatása jobbra (óra járásával egyezően)"
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "_Nincs"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "_Letter"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "Le_gal"
 
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr "Mentés"
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr "Dokumentum fájlba mentése"
+msgid "_Custom"
+msgstr "_Egyéni"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr "Sz_kennelés"
+msgid "_Rotate Crop"
+msgstr "Kivágott rész fo_rgatása"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
-msgstr "Szkennelés"
+msgid "Move Left"
+msgstr "Mozgatás balra"
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr "Szkennelés _forrása:"
+msgid "Move Right"
+msgstr "Mozgatás jobbra"
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr "Oldal szkennelése:"
+msgid "_Help"
+msgstr "_Súgó"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
-msgstr "Egy oldal szkennelése az eszközről"
-
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr "Simple Scan"
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr "Egy _oldal"
+msgid "_Contents"
+msgstr "_Tartalom"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
 msgstr "Új dokumentum létrehozása"
 
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "Új"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "Egy oldal szkennelése az eszközről"
+
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
-msgstr "Leállít"
+msgid "Scan"
+msgstr "Szkennelés"
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr "Dokumentum fájlba mentése"
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "Mentés"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
 msgid "Stop the current scan"
 msgstr "A jelenlegi szkennelés leállítása"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr "Szöveg"
-
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr "_Felhatalmazás"
+msgid "Stop"
+msgstr "Leállít"
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
-msgstr "_Tartalom"
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Az oldal elforgatása balra (óra járásával ellentétesen)"
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr "_Kivágás"
+msgid "Rotate Left"
+msgstr "Forgatás balra"
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr "_Egyéni"
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Az oldal elforgatása jobbra (óra járásával egyezően)"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr "_Dokumentum"
+msgid "Rotate Right"
+msgstr "Forgatás jobbra"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "A kiválasztott oldal levágása"
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
-msgstr "_E-mail"
+msgid "Crop"
+msgstr "Kivágás"
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr "_Súgó"
+msgid "_Username for resource:"
+msgstr "_Felhasználónév az erőforráshoz:"
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr "_Letter"
+msgid "_Password:"
+msgstr "_Jelszó:"
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr "_Nincs"
+msgid "_Authorize"
+msgstr "_Felhatalmazás"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr "_Oldal"
+msgid "Preferences"
+msgstr "Beállítások"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr "_Jelszó:"
+msgid "Scan S_ource:"
+msgstr "Szkennelés _forrása:"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
-msgstr "_Fotó felbontása:"
+msgid "_Text Resolution:"
+msgstr "_Szöveg felbontása:"
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr "Kivágott rész fo_rgatása"
+msgid "_Photo Resolution:"
+msgstr "_Fotó felbontása:"
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
-msgstr "_Szkennelés megállítása"
+msgid "Scan Side:"
+msgstr "Oldal szkennelése:"
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
-msgstr "_Szöveg felbontása:"
+msgid "Page Size:"
+msgstr "Oldalméret:"
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
-msgstr "_Felhasználónév az erőforráshoz:"
+msgid "Brightness:"
+msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
-msgstr "Dokumentumok szkennelése"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
-msgstr "A szkennelő eszkőz"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
-msgstr "A szkennelés íránya"
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "Előlap és hátlap"
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
-msgstr "Fájlok mentése ebbe a könyvtárba"
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "Előlap"
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
-msgstr "Papír magassága tizedmilliméterben"
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "Hátlap"
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr "A szkennelt kép magassága képpontban"
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "Dokumentumok szkennelése"
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
-msgstr "Lapok szkennelendő oldala"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "Ablak szélessége képpontban"
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
-msgstr "Fotók szkennelésének felbontása"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "Ablak magassága képpontban"
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
-msgstr "Szövegek szkennelésének felbontása"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "Igaz, ha az alkalmazás teljes képernyős módban van"
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
-msgstr "Az utoljára beszkennelt kép felbontása"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "A szkennelő eszkőz"
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
 msgstr "Képek beszerzése erről a SANE eszközről"
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
-msgstr "Igaz, ha az alkalmazás teljes képernyős módban van"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "A szkennelt dokumentum típusa"
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
-"A szkennelés iránya, a lehetséges értékek a következők: „top-to-bottom” "
-"(fentről lefelé), „bottom-to-top” (lentről felfelé)  „left-to-right” (balról "
-"jobbra), „right-to-left” (jobbról balra)"
+"A szkennelt dokumentum típusa. Ez a beállítás meghatározza a beolvasott "
+"oldal felbontását, színeit és utófeldolgozását."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "A szkennelés íránya"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "A szkennelés iránya a szkennelt lap fölött."
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "A szkennelt kép szélessége képpontban"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
 msgstr ""
-"A fájlok mentésének helye. Alapértelmezésben a Dokumentumok mappa, ha nincs "
-"beállítva."
+"A szkennelt kép szélessége képpontban. Mindig a legutolsó szkennelés "
+"eredményét veszi fel."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "A szkennelt kép magassága képpontban"
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
@@ -334,244 +355,244 @@ msgstr ""
 "A szkennelt kép magassága képpontban. Mindig a legutolsó szkennelés "
 "eredményét veszi fel."
 
-#: ../data/simple-scan.schemas.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "Papír szélessége tizedmilliméterben"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Papír szélessége tizedmilliméterben (0 az automatikus papírfelismeréshez)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "Papír magassága tizedmilliméterben"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 "Papír magassága tizedmilliméterben (0 az automatikus papírfelismeréshez)."
 
-#: ../data/simple-scan.schemas.in.h:16
-msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
-"Lapok szkennelendő oldala. A lehetséges értékek: „both” (mindkettő) „front” "
-"(előlap), „back” (hátlap)"
 
-#: ../data/simple-scan.schemas.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "Az utoljára beszkennelt kép felbontása"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
 msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr "Az utoljára beszkennelt kép DPI felbontása."
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "Fotók szkennelésnél használandó  DPI felbontás."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "Szövegek szkennelésének felbontása"
 
-#: ../data/simple-scan.schemas.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "Szövegek szkennelésnél használandó  DPI felbontás."
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"A szkennelt kép szélessége képpontban. Mindig a legutolsó szkennelés "
-"eredményét veszi fel."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "Fotók szkennelésének felbontása"
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Papír szélessége tizedmilliméterben (0 az automatikus papírfelismeréshez)."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "Fotók szkennelésnél használandó  DPI felbontás."
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
-msgstr "A szkennelt dokumentum típusa"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "Lapok szkennelendő oldala"
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
-msgstr ""
-"A szkennelt dokumentum típusa. „text” a szöveges dokumentumokhoz, „photo” a "
-"fotókhoz. Ez a beállítás határozza meg a szkennelt dokumentum felbontását, "
-"színeit és utófeldolgozását."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "A lap szkennelendő oldala."
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
-msgstr "Papír szélessége tizedmilliméterben"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "Fájlok mentése ebbe a könyvtárba"
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
-msgstr "A szkennelt kép szélessége képpontban"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"A fájlok mentésének helye. Alapértelmezésben a Dokumentumok mappa, ha nincs "
+"beállítva."
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
-msgstr "Ablak magassága képpontban"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
-msgstr "Ablak szélessége képpontban"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Nem található szkenner. Csatlakoztasson egyet."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
 msgstr "Nem sikerült csatlakozni a szkennerhez"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
 msgstr "Nem sikerült elindítani a szkennelést"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
 msgstr "Kommunikációs hiba a szkennerrel"
 
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Verziószám megjelenítése"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Hibakeresési üzenetek kiírása"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr "A Simple Scan régebbi verzióival készült PDF fájlok javítása"
+
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
 msgstr "A szkennelés meghiúsult"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
 msgstr "Beszkennelt dokumentum"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
-msgstr ""
-"Használat:\n"
-"  %s [ESZKÖZ...] - Szkennelő segédprogram"
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[ESZKÖZ…] – Szkennelő segédprogram"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
-#, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
-msgstr ""
-"Súgókapcsolók:\n"
-"  -d, --debug Hibakeresési üzenetek megjelenítése\n"
-"  -v, --version Verziószám megjelenítése\n"
-"  -h,  --help Súgókapcsolók megjelenítése\n"
-"  -help-all Minden súgókapcsoló megjelenítése\n"
-"  --help-gtk GTK+ kapcsolók megjelenítése"
-
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
+msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
-"GTK+ beállításai\n"
-"  --class=OSZTÁLY                 A program osztálya, ahogy az ablakkezelő "
-"használja\n"
-"  --name=NÉV                      A programnév, ahogy az ablakkezelő "
-"használja\n"
-"  --display=MEGJELENÍTŐ           Használandó X-megjelenítő\n"
-"  --screen=KÉPERNYŐ               Használandó X-képernyő\n"
-"  --sync                          Legyenek szinkron X-hívások\n"
-"  --gtk-module=MODULOK            További GTK+ modulok betöltése\n"
-"  --g-fatal-warnings              Minden figyelmeztetés végzetes legyen"
+"Futtassa a(z) „%s --help” parancsot a parancssori kapcsolók listájáért."
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "Szkennelt dokumentum.pdf"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "A(z) „%s” eléréséhez felhasználónév és jelszó szükséges"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
 msgstr "Nem található szkenner"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "Ellenőrizze, hogy a szkenner csatlakoztatva van, és be van-e kapcsolva"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr "PDF (többoldalas dokumentum)"
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr "JPEG (tömörített)"
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr "PNG (veszteségmentes)"
-
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
 msgstr "Mentés másként…"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
 msgstr "Képfájlok"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
 msgstr "Minden fájl"
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
 msgstr "Válasszon fájl_típust"
 
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF (többoldalas dokumentum)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (tömörített)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (veszteségmentes)"
+
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
 msgstr "A fájl mentése sikertelen"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Ha nem ment, akkor a változtatások véglegesen elvesznek."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
 msgstr "Mentse az aktuális dokumentumot?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
 msgstr "Módosítások eldobása"
 
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "A képfájlt nem lehet elmenteni előnézethez"
+
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
 msgstr "Nem nyitható meg az előnézetet megjelenítő alkalmazás"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
 msgstr "A súgófájl nem nyitható meg"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -599,80 +620,189 @@ msgstr ""
 "meg, itt elolvashatja: <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
 msgstr "Simple Scan névjegye"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
 msgstr "Egyszerű dokumentumszkennelés"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Gabor Kelemen https://launchpad.net/~kelemeng\n"
 "  Krasznecz Zoltán https://launchpad.net/~krasznecz-zoltan\n"
+"  Muszela Balázs https://launchpad.net/~bazsi86-deactivatedaccount\n"
+"  Mátyás Demeter https://launchpad.net/~mathias-demeter\n"
 "  Papp Bence https://launchpad.net/~sclegnrbs\n"
 "  Pittmann Tamás https://launchpad.net/~zaivaldi\n"
+"  Péter Trombitás https://launchpad.net/~trombipeti\n"
 "  Richard Somlói https://launchpad.net/~ricsipontaz\n"
+"  Szávics Dániel https://launchpad.net/~szavics-dani-deactivatedaccount\n"
 "  csola48 https://launchpad.net/~mail-csordaslaszlo"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
 msgstr "Menti a dokumentumot kilépés előtt?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
 msgstr "Kilépés mentés nélkül"
 
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (alapértelmezett)"
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#: ../src/ui.vala:1292
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (vázlat)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
-#, c-format
-msgid "%d dpi"
-msgstr "%d dpi"
-
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (nagy felbontás)"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
-msgstr "%d dpi (alapértelmezett)"
+msgid "%d dpi"
+msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
 msgstr "Hiányzó fájl"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
 msgstr "Ellenőrizze a telepítést"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
 msgstr "_Szkennerváltás"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
 msgstr "Automatikus"
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
-msgstr "Szkennelt dokumentum.pdf"
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr ""
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr ""
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr ""
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr ""
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr ""
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr ""
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "Dokumentum mentése..."
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "%d. oldal mentése, összesen %d"
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "Használat:\n"
+#~ "  %s [ESZKÖZ...] - Szkennelő segédprogram"
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "GTK+ beállításai\n"
+#~ "  --class=OSZTÁLY                 A program osztálya, ahogy az ablakkezelő "
+#~ "használja\n"
+#~ "  --name=NÉV                      A programnév, ahogy az ablakkezelő "
+#~ "használja\n"
+#~ "  --display=MEGJELENÍTŐ           Használandó X-megjelenítő\n"
+#~ "  --screen=KÉPERNYŐ               Használandó X-képernyő\n"
+#~ "  --sync                          Legyenek szinkron X-hívások\n"
+#~ "  --gtk-module=MODULOK            További GTK+ modulok betöltése\n"
+#~ "  --g-fatal-warnings              Minden figyelmeztetés végzetes legyen"
+
+#~ msgid ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ msgstr ""
+#~ "A szkennelés iránya, a lehetséges értékek a következők: „top-to-bottom” "
+#~ "(fentről lefelé), „bottom-to-top” (lentről felfelé)  „left-to-right” (balról "
+#~ "jobbra), „right-to-left” (jobbról balra)"
+
+#~ msgid ""
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
+#~ msgstr ""
+#~ "A szkennelt dokumentum típusa. „text” a szöveges dokumentumokhoz, „photo” a "
+#~ "fotókhoz. Ez a beállítás határozza meg a szkennelt dokumentum felbontását, "
+#~ "színeit és utófeldolgozását."
+
+#, c-format
+#~ msgid ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+#~ msgstr ""
+#~ "Súgókapcsolók:\n"
+#~ "  -d, --debug Hibakeresési üzenetek megjelenítése\n"
+#~ "  -v, --version Verziószám megjelenítése\n"
+#~ "  -h,  --help Súgókapcsolók megjelenítése\n"
+#~ "  -help-all Minden súgókapcsoló megjelenítése\n"
+#~ "  --help-gtk GTK+ kapcsolók megjelenítése"
+
+#~ msgid ""
+#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ msgstr ""
+#~ "Lapok szkennelendő oldala. A lehetséges értékek: „both” (mindkettő) „front” "
+#~ "(előlap), „back” (hátlap)"
diff --git a/po/hy.po b/po/hy.po
new file mode 100644
index 0000000..0704a24
--- /dev/null
+++ b/po/hy.po
@@ -0,0 +1,706 @@
+# Armenian translation for simple-scan
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the simple-scan package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: simple-scan\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-04-17 06:12+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"Language-Team: Armenian <hy@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: 2013-09-13 05:44+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
+
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr ""
+
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: ../data/simple-scan.ui.h:4
+msgid "_Document"
+msgstr ""
+
+#. Scan menu item
+#: ../data/simple-scan.ui.h:6
+msgid "Sc_an"
+msgstr ""
+
+#. Toolbar scan menu item to scan a single page from the scanner
+#: ../data/simple-scan.ui.h:8
+msgid "Single _Page"
+msgstr ""
+
+#. Toolbar scan menu item to scan all pages from a document feeder
+#: ../data/simple-scan.ui.h:10
+msgid "All Pages From _Feeder"
+msgstr ""
+
+#. Menu entry to stop current scan
+#: ../data/simple-scan.ui.h:12
+msgid "_Stop Scan"
+msgstr ""
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:14
+msgid "Text"
+msgstr ""
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:16
+msgid "Photo"
+msgstr ""
+
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr ""
+
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr ""
+
+#. Menu item to rotate page to left (anti-clockwise)
+#: ../data/simple-scan.ui.h:22
+msgid "Rotate _Left"
+msgstr ""
+
+#. Menu item to rotate page to right (clockwise)
+#: ../data/simple-scan.ui.h:24
+msgid "Rotate _Right"
+msgstr ""
+
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr ""
+
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr ""
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr ""
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr ""
+
+#. Radio button for cropping page to 4x6 inch
+#: ../data/simple-scan.ui.h:40
+msgid "4&#xD7;6"
+msgstr ""
+
+#. Radio button for cropping to custom page size
+#: ../data/simple-scan.ui.h:42
+msgid "_Custom"
+msgstr ""
+
+#. Menu item to rotate the crop area
+#: ../data/simple-scan.ui.h:44
+msgid "_Rotate Crop"
+msgstr ""
+
+#. Menu item to move the selected page to the left
+#: ../data/simple-scan.ui.h:46
+msgid "Move Left"
+msgstr ""
+
+#. Menu item to move the selected page to the right
+#: ../data/simple-scan.ui.h:48
+msgid "Move Right"
+msgstr ""
+
+#. Label on help menu
+#: ../data/simple-scan.ui.h:50
+msgid "_Help"
+msgstr ""
+
+#. Help|Contents menu
+#: ../data/simple-scan.ui.h:52
+msgid "_Contents"
+msgstr ""
+
+#. Tooltip for new document button
+#: ../data/simple-scan.ui.h:54
+msgid "Start a new document"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr ""
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr ""
+
+#. Label on scan toolbar item
+#: ../data/simple-scan.ui.h:59
+msgid "Scan"
+msgstr ""
+
+#. Tooltip for save toolbar button
+#: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr ""
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
+msgid "Stop the current scan"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:65
+msgid "Stop"
+msgstr ""
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: ../data/simple-scan.ui.h:67
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr ""
+
+#. Label on rotate page left (anti-clockwise) item
+#: ../data/simple-scan.ui.h:69
+msgid "Rotate Left"
+msgstr ""
+
+#. Tooltip for rotate right (clockwise) button
+#: ../data/simple-scan.ui.h:71
+msgid "Rotate the page to the right (clockwise)"
+msgstr ""
+
+#. Label on rotate page right (clockwise) item
+#: ../data/simple-scan.ui.h:73
+msgid "Rotate Right"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:75
+msgid "Crop"
+msgstr ""
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:77
+msgid "_Username for resource:"
+msgstr ""
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:79
+msgid "_Password:"
+msgstr ""
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:81
+msgid "_Authorize"
+msgstr ""
+
+#. Title of preferences dialog
+#: ../data/simple-scan.ui.h:83
+msgid "Preferences"
+msgstr ""
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:85
+msgid "Scan S_ource:"
+msgstr ""
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:87
+msgid "_Text Resolution:"
+msgstr ""
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:89
+msgid "_Photo Resolution:"
+msgstr ""
+
+#. Label beside scan side combo box
+#: ../data/simple-scan.ui.h:91
+msgid "Scan Side:"
+msgstr ""
+
+#. Label beside page size combo box
+#: ../data/simple-scan.ui.h:93
+msgid "Page Size:"
+msgstr ""
+
+#. Label beside brightness scale
+#: ../data/simple-scan.ui.h:95
+msgid "Brightness:"
+msgstr ""
+
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr ""
+
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr ""
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr ""
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr ""
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "Ետ"
+
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+msgid "SANE device to acquire images from."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
+msgid ""
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
+msgid ""
+"The height of scanned image in pixels. This value is updated to what the "
+"last scanned page was."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
+msgid "The resolution in dots-per-inch of the previously scanned image."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr ""
+
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:814
+msgid "No scanners available.  Please connect a scanner."
+msgstr ""
+
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:844
+msgid "Unable to connect to scanner"
+msgstr ""
+
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1207
+msgid "Unable to start scan"
+msgstr ""
+
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+msgid "Error communicating with scanner"
+msgstr ""
+
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr ""
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr ""
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:297
+msgid "Failed to scan"
+msgstr ""
+
+#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
+#: ../src/simple-scan.vala:316
+msgid "Scanned Document"
+msgstr ""
+
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr ""
+
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
+#, c-format
+msgid "Run '%s --help' to see a full list of available command line options."
+msgstr ""
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr ""
+
+#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
+#: ../src/ui.vala:159
+#, c-format
+msgid "Username and password required to access '%s'"
+msgstr ""
+
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:202
+msgid "No scanners detected"
+msgstr ""
+
+#. Hint to user on why there are no scanners detected
+#: ../src/ui.vala:204
+msgid "Please check your scanner is connected and powered on"
+msgstr ""
+
+#. Save dialog: Dialog title
+#: ../src/ui.vala:363
+msgid "Save As..."
+msgstr ""
+
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:377
+msgid "Image Files"
+msgstr ""
+
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:383
+msgid "All Files"
+msgstr ""
+
+#. 
+#: ../src/ui.vala:388
+msgid "Select File _Type"
+msgstr ""
+
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr ""
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr ""
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr ""
+
+#. Title of error dialog when save failed
+#: ../src/ui.vala:503
+msgid "Failed to save file"
+msgstr ""
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:526
+msgid "If you don't save, changes will be permanently lost."
+msgstr ""
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:563
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:565
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.vala:872
+msgid "Unable to open image preview application"
+msgstr ""
+
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1119
+msgid "Unable to open help file"
+msgstr ""
+
+#. The license this software is under (GPL3+)
+#: ../src/ui.vala:1130
+msgid ""
+"This program is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 3 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program.  If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+
+#. Title of about dialog
+#: ../src/ui.vala:1133
+msgid "About Simple Scan"
+msgstr ""
+
+#. Description of program
+#: ../src/ui.vala:1136
+msgid "Simple document scanning tool"
+msgstr ""
+
+#: ../src/ui.vala:1145
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Serj Safarian https://launchpad.net/~safarian"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1156
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1158
+msgid "Quit without Saving"
+msgstr ""
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr ""
+
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1292
+#, c-format
+msgid "%d dpi (draft)"
+msgstr ""
+
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1295
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr ""
+
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
+#, c-format
+msgid "%d dpi"
+msgstr ""
+
+#. Title of dialog when cannot load required files
+#: ../src/ui.vala:1333
+msgid "Files missing"
+msgstr ""
+
+#. Description in dialog when cannot load required files
+#: ../src/ui.vala:1335
+msgid "Please check your installation"
+msgstr ""
+
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1403
+msgid "Change _Scanner"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1409
+msgid "Automatic"
+msgstr ""
+
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr ""
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr ""
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr ""
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr ""
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr ""
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr ""
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr ""
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr ""
diff --git a/po/id.po b/po/id.po
index 253af63..829b38d 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,35 +7,34 @@ msgid ""
 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-15 06:31+0000\n"
-"Last-Translator: Launchpad Translations Administrators "
-"<rosetta@launchpad.net>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-07-23 09:02+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Indonesian <id@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-10-22 04:47+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:45+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
 msgstr ""
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
+msgid "_Document"
 msgstr ""
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
+msgid "Sc_an"
 msgstr ""
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
+msgid "Single _Page"
 msgstr ""
 
 #. Toolbar scan menu item to scan all pages from a document feeder
@@ -43,501 +42,545 @@ msgstr ""
 msgid "All Pages From _Feeder"
 msgstr ""
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr ""
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
+msgid "_Stop Scan"
 msgstr ""
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
+msgid "Text"
 msgstr ""
 
-#. Combo box label for scanning the front side of a page
+#. Combo box label for photo scan mode
 #: ../data/simple-scan.ui.h:16
-msgid "Front"
+msgid "Photo"
 msgstr ""
 
-#. Combo box label for scanning both sides of a page
+#. Label on email menu item
 #: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
+msgid "_Email"
 msgstr ""
 
-#. Radio button for cropping to page to US legal size
+#. Page menu (contains action for each page, e.g. delete, crop)
 #: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr ""
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
+msgid "_Page"
 msgstr ""
 
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
+#. Menu item to rotate page to left (anti-clockwise)
+#: ../data/simple-scan.ui.h:22
+msgid "Rotate _Left"
 msgstr ""
 
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
-msgid "Photo"
+#. Menu item to rotate page to right (clockwise)
+#: ../data/simple-scan.ui.h:24
+msgid "Rotate _Right"
 msgstr ""
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
 msgstr ""
 
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
 msgstr ""
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
 msgstr ""
 
-#. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
-msgid "Rotate _Left"
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
 msgstr ""
 
-#. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
-msgid "Rotate _Right"
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
 msgstr ""
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
 msgstr ""
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
 msgstr ""
 
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
+msgid "4&#xD7;6"
 msgstr ""
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
+msgid "_Custom"
 msgstr ""
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
+msgid "_Rotate Crop"
 msgstr ""
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
+msgid "Move Left"
 msgstr ""
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
+msgid "Move Right"
 msgstr ""
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
+msgid "_Help"
 msgstr ""
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
+msgid "_Contents"
 msgstr ""
 
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
+#. Tooltip for new document button
+#: ../data/simple-scan.ui.h:54
+msgid "Start a new document"
 msgstr ""
 
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
+#: ../data/simple-scan.ui.h:55
+msgid "New"
 msgstr ""
 
-#. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
-msgid "Start a new document"
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
 msgstr ""
 
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
+msgid "Scan"
 msgstr ""
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
-msgid "Stop the current scan"
+msgid "Save document to a file"
 msgstr ""
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr ""
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
+msgid "Stop the current scan"
 msgstr ""
 
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
+msgid "Stop"
 msgstr ""
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
+msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
+msgid "Rotate Left"
 msgstr ""
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
+msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
+msgid "Rotate Right"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
 msgstr ""
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
+msgid "Crop"
 msgstr ""
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
+msgid "_Username for resource:"
 msgstr ""
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
+msgid "_Password:"
 msgstr ""
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
+msgid "_Authorize"
 msgstr ""
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
+msgid "Preferences"
 msgstr ""
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
+msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
+msgid "_Text Resolution:"
 msgstr ""
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
+msgid "_Photo Resolution:"
 msgstr ""
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
+msgid "Scan Side:"
 msgstr ""
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
+msgid "Page Size:"
 msgstr ""
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
+msgid "Brightness:"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 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
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
 msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
 msgstr ""
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
 msgstr ""
 
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr ""
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr ""
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
 msgstr ""
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
 msgstr ""
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
+msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
-#, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr ""
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr ""
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr ""
-
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
 msgstr ""
 
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr ""
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr ""
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
 msgstr ""
 
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr ""
+
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -554,75 +597,122 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Abdul Munif Hanafi https://launchpad.net/~nafica-coroz"
+"  Abdul Munif Hanafi https://launchpad.net/~nafica-coroz\n"
+"  Arief Setiadi Wibowo https://launchpad.net/~q-thrynx\n"
+"  Hace https://launchpad.net/~hardikris\n"
+"  La Ode Adam Saputra https://launchpad.net/~laode-saputra\n"
+"  Launchpad Translations Administrators https://launchpad.net/~rosetta\n"
+"  Putu Wiramaswara Widya https://launchpad.net/~wiramaswara\n"
+"  Rahman Yusri Aftian https://launchpad.net/~aftian\n"
+"  Trisno Pamuji https://launchpad.net/~tri.snowman\n"
+"  Viktor Aditya https://launchpad.net/~victoraditya91\n"
+"  Waluyo Adi Siswanto https://launchpad.net/~was-wlk\n"
+"  idham khaidir https://launchpad.net/~kenzoabeta\n"
+"  imsoft https://launchpad.net/~khoirul-im\n"
+"  jemmy surya https://launchpad.net/~jemmy"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
 msgstr ""
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
 #, c-format
-msgid "%d dpi (draft)"
+msgid "%d dpi (default)"
 msgstr ""
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1292
 #, c-format
-msgid "%d dpi"
+msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
+msgid "%d dpi"
 msgstr ""
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
 msgstr ""
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr ""
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr ""
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr ""
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr ""
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr ""
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr ""
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr ""
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index c23b5a0..d205cc9 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,326 +7,348 @@ msgid ""
 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-14 14:53+0000\n"
-"Last-Translator: Milo Casagrande <milo@casagrande.name>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-08-22 07:09+0000\n"
+"Last-Translator: Leonardo Corato <leocor@gmail.com>\n"
 "Language-Team: Italian <it@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-10-22 04:47+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:45+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Simple Scan"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr "A_4"
+msgid "_Document"
+msgstr "_Documento"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr "_Acquisisci"
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "_Pagina singola"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:10
 msgid "All Pages From _Feeder"
 msgstr "_Tutte le pagine dal caricatore"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr "Retro"
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
-msgstr "Ritaglia"
+msgid "_Stop Scan"
+msgstr "Ferma l'acqui_sizione"
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr "Ritaglia la pagina selezionata"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr "Fronte"
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr "Fronte e retro"
-
-#. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr "Le_gal"
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr "Nuovo"
-
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr "Dimensione pagina:"
+msgid "Text"
+msgstr "Testo"
 
 #. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
+#: ../data/simple-scan.ui.h:16
 msgid "Photo"
 msgstr "Foto"
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr "Preferenze"
-
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
-msgstr "Ruota a sinistra"
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr "_Email"
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr "Ruota a destra"
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr "_Pagina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
+#: ../data/simple-scan.ui.h:22
 msgid "Rotate _Left"
 msgstr "Ruota a _sinistra"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
+#: ../data/simple-scan.ui.h:24
 msgid "Rotate _Right"
 msgstr "Ruota a _destra"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Ruota la pagina a sinistra (senso antiorario)"
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "_Ritaglio"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Ruota la pagina a destra (senso orario)"
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "_Nessuno"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
 
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "US _Letter"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "Le_gal"
+
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr "Salva"
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr "Salva documento in un file"
+msgid "_Custom"
+msgstr "_Personalizzato"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr "_Acquisisci"
+msgid "_Rotate Crop"
+msgstr "_Ruota ritaglio"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
-msgstr "Acquisisci"
+msgid "Move Left"
+msgstr "Sposta a sinistra"
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr "S_orgente di acquisizione:"
+msgid "Move Right"
+msgstr "Sposta a destra"
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr "Lato acquisizione:"
+msgid "_Help"
+msgstr "A_iuto"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
-msgstr "Acquisisce una pagina singola dallo scanner"
-
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr "Simple Scan"
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr "_Pagina singola"
+msgid "_Contents"
+msgstr "_Sommario"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
 msgstr "Crea un nuovo documento"
 
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "Nuovo"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "Acquisisce una pagina singola dallo scanner"
+
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
-msgstr "Ferma"
+msgid "Scan"
+msgstr "Acquisisci"
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr "Salva documento in un file"
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "Salva"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
 msgid "Stop the current scan"
 msgstr "Interrompe l'acquisizione in corso"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr "Testo"
-
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr "_Autorizza"
+msgid "Stop"
+msgstr "Ferma"
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
-msgstr "_Sommario"
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Ruota la pagina a sinistra (senso antiorario)"
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr "_Ritaglia"
+msgid "Rotate Left"
+msgstr "Ruota a sinistra"
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr "_Personalizzato"
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Ruota la pagina a destra (senso orario)"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr "_Documento"
+msgid "Rotate Right"
+msgstr "Ruota a destra"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "Ritaglia la pagina selezionata"
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
-msgstr "_Email"
+msgid "Crop"
+msgstr "Ritaglia"
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr "A_iuto"
+msgid "_Username for resource:"
+msgstr "_Nome utente per la risorsa:"
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr "US _Letter"
+msgid "_Password:"
+msgstr "Pass_word:"
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr "_Niente"
+msgid "_Authorize"
+msgstr "_Autorizza"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr "_Pagina"
+msgid "Preferences"
+msgstr "Preferenze"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr "Pass_word:"
+msgid "Scan S_ource:"
+msgstr "S_orgente di acquisizione:"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
-msgstr "_Risoluzione foto:"
+msgid "_Text Resolution:"
+msgstr "Risoluzione _testo:"
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr "_Ruota ritaglio"
+msgid "_Photo Resolution:"
+msgstr "_Risoluzione foto:"
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
-msgstr "Ferma l'acqui_sizione"
+msgid "Scan Side:"
+msgstr "Lato acquisizione:"
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
-msgstr "Risoluzione _testo:"
+msgid "Page Size:"
+msgstr "Dimensione pagina:"
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
-msgstr "_Nome utente per la risorsa:"
+msgid "Brightness:"
+msgstr "Luminosità:"
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
-msgstr "Acquisisci documenti"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr "Contrasto:"
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
-msgstr "Dispositivo di acquisizione"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr "Qualità:"
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
-msgstr "Direzione dell'acquisizione"
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "Fronte e retro"
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
-msgstr "Directory dove salvare i file"
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "Fronte"
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
-msgstr "Altezza del foglio in decimi di mm"
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "Retro"
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr "Altezza dell'immagine acquisita in pixel"
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "Acquisisci documenti"
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
-msgstr "Lato della pagina da acquisire"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "Larghezza della finestra in pixel"
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
-msgstr "Risoluzione per acquisizione foto"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "Altezza della finestra in pixel"
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
-msgstr "Risoluzione per acquisizione testo"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "VERO se la finestra dell'applicazione è massimizzata"
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
-msgstr "Risoluzione dell'ultima immagine acquisita"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "Dispositivo di acquisizione"
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
 msgstr "Dispositivo SANE da cui acquisire le immagini."
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
-msgstr "VERO se la finestra dell'applicazione è massimizzata"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "Tipo del documento da acquisire"
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
-"La direzione di acquisizione. Può essere uno dei seguenti valori: \"top-to-"
-"bottom\" (dall'alto in basso), \"bottom-to-top\" (dal basso in alto), \"left-"
-"to-right\" (da sinistra a destra), \"right-to-left\" (da destra a sinistra)"
+"Tipo del documento da acquisire. Questa impostazione influenza la "
+"risoluzione, il numero dei colori e l'elaborazione successiva "
+"all'acquisizione."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "Direzione dell'acquisizione"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "La direzione dell'acquisizione lungo la pagina."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "Larghezza dell'immagine acquisita in pixel"
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
 msgstr ""
-"La directory dove salvare i file. Valore predefinito è la directory dei "
-"documenti."
+"Larghezza dell'immagine acquisita in pixel. Questo valore è aggiornato "
+"all'ultima acquisizione."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "Altezza dell'immagine acquisita in pixel"
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
@@ -334,245 +356,249 @@ msgstr ""
 "Altezza dell'immagine acquisita in pixel. Questo valore è aggiornato "
 "all'ultima acquisizione."
 
-#: ../data/simple-scan.schemas.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "Larghezza del foglio in decimi di mm"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
-msgstr "Altezza del foglio in decimi di mm (0 per rilevamento automatico)."
+msgstr ""
+"L'altezza del foglio in decimi di mm  (0 per il rilevamento automatico)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "Altezza del foglio in decimi di mm"
 
-#: ../data/simple-scan.schemas.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Altezza del foglio in decimi di mm (0 per il rilevamento automatico)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr "Luminosità dell'acquisizione"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr ""
-"I lati della pagina da acquisire. Può essere uno dei seguenti: \"entrambi\" "
-"\"fronte\" \"retro\""
+"La regolazione della luminosità da -100 a 100 (0 per alcuna luminosità)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr "Contrasto dell'acquisizione"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "La regolazione del contrasto da -100 a 100 (0 per alcun contrasto)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "Risoluzione dell'ultima immagine acquisita"
 
-#: ../data/simple-scan.schemas.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
 msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr ""
 "La risoluzione in punti per pollice del documento precedentemente acquisito."
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-"La risoluzione in punti per pollice da usare per l'acquisizione di foto."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "Risoluzione per acquisizione testo"
 
-#: ../data/simple-scan.schemas.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 "La risoluzione in punti per pollice da usare per l'acquisizione di testi."
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"Larghezza dell'immagine acquisita in pixel. Questo valore è aggiornato "
-"all'ultima acquisizione."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "Risoluzione per acquisizione foto"
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
-"L'altezza del foglio in decimi di mm  (0 per rilevamento automatico)."
+"La risoluzione in punti per pollice da usare per l'acquisizione di foto."
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
-msgstr "Tipo del documento da acquisire"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "Lato della pagina da acquisire"
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
-msgstr ""
-"Tipo di documento da acquisire. \"text\" per documenti di testo, \"photo\" "
-"per fotografie. Questa impostazione influenza la risoluzione "
-"dell'acquisizione, le impostazioni di colore e la post-produzione."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "Lato della pagina da acquisire."
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
-msgstr "Larghezza del foglio in decimi di mm"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "Directory dove salvare i file"
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
-msgstr "Larghezza dell'immagine acquisita in pixel"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"La directory dove salvare i file. Il valore predefinito è la directory dei "
+"documenti."
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
-msgstr "Altezza della finestra in pixel"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr "Indica il valore della qualità per la compressione JPEG"
 
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
-msgstr "Larghezza della finestra in pixel"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr "Indica il valore della qualità per la compressione JPEG"
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Nessuno scanner disponibile. Collegare uno scanner."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
 msgstr "Impossibile connettersi allo scanner"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
-msgstr "Impossibile avviare la scansione"
+msgstr "Impossibile avviare l'acquisizione"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
 msgstr "Errore di comunicazione con lo scanner"
 
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Mostra la versione del rilascio"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Stampa i messaggi di debug"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr "Corregge file PDF generati con una vecchia versione di Simple Scan"
+
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
 msgstr "Acquisizione non riuscita"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
 msgstr "Documento acquisito"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
-msgstr ""
-"Uso:\n"
-"  %s [DISPOSITIVO...] - Strumento di acquisizione"
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[DISPOSITIVO...] - Strumento per l'acquisizione"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
-msgstr ""
-"Opzioni d'aiuto:\n"
-"  -d, --debug Visualizza i messaggi di debug\n"
-"  -v, --version Mostra la versione in uso\n"
-"  -h, --help Mostra il menù di aiuto\n"
-"  --help-all Mostra il menù di aiuto completo\n"
-"  --help-gtk Mostra le opzioni di GTK+"
-
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
-#, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
+msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
-"Opzioni GTK+:\n"
-"  --class=CLASS                   Classe del programma utilizzata dal "
-"gestore di finestre\n"
-"  --name=NAME                     Nome del programma utilizzato dal gestore "
-"di finestre\n"
-"  --screen=SCREEN                 Screen X da utilizzare\n"
-"  --sync                          Rende le chiamate a X sincrone\n"
-"  --gtk-module=MODULES            Carica moduli GTK+ aggiuntivi\n"
-"  --g-fatal-warnings              Rende fatali tutti gli avvertimenti"
+"Eseguire \"%s --help\" per l'elenco completo delle opzioni disponibili a "
+"riga di comando."
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "Documento-acquisito.pdf"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Sono richiesti nome utente e password per accedere a «%s»"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
-msgstr "Non sono stati rilevati scanner"
+msgstr "Nessuno scanner rilevato"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
 msgstr "Controllare che lo scanner sia collegato e acceso"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr "PDF (documento multi-pagina)"
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr "JPEG (compresso)"
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr "PNG (senza perdita di qualità)"
-
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
 msgstr "Salva come..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
 msgstr "File immagine"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
 msgstr "Tutti i file"
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
 msgstr "Seziona il _tipo di file"
 
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF (documento multi-pagina)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (compresso)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (senza perdita di qualità)"
+
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
 msgstr "Salvataggio file non riuscito"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Se non si salva le modifiche andranno perse per sempre."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
 msgstr "Salvare il documento corrente?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
 msgstr "Scarta le modifiche"
 
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "Impossibile salvare l'immagine per l'anteprima"
+
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
 msgstr ""
 "Impossibile aprire l'applicazione per la visualizzazione delle anteprime"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
 msgstr "Impossibile aprire il file di aiuto"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -587,104 +613,214 @@ msgid ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
-"Questo programma è software libero: è possibile ridistribuirlo o "
+"Questo programma è software libero; è possibile ridistribuirlo e/o "
 "modificarlo\n"
-"secondo i termini della licenza GNU General Public License così come "
-"pubblicata dalla\n"
-"Free Software Foundation, nella versione 3 della Licenza, o\n"
-"(a vostra discrezione) successive.\n"
+"secondo i termini della licenza GNU General Public License, come pubblicata\n"
+"dalla Free Software Foundation; versione 2 della Licenza, o (a scelta) una\n"
+"versione più recente.\n"
 "\n"
-"Questo programma è distribuito con la speranza si dimostri utile,\n"
-"ma SENZA ALCUNA GARANZIA; si esclude anche l'implicita garanzia di \n"
-"COMMERCIABILITA' o IDONEITA' A UN PARTICOLARE SCOPO. Si consulti \n"
-"la licenza GNU General Public License per utleriori dettagli.\n"
+"Questo programma è distribuito nella speranza che possa risultare utile,\n"
+"ma SENZA ALCUNA GARANZIA, nemmeno la garanzia implicita di \n"
+"COMMERCIABILITÀ o APPLICABILITÀ PER UNO SCOPO PARTICOLARE. Per\n"
+"maggiori dettagli consultare la GNU General Public License.\n"
 "\n"
 "La traduzione in Italiano di questa licenza è solo a fini informativi. Per "
 "la licenza in Inglese con validità legale consultate "
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
 msgstr "Informazioni su Simple Scan"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
-msgstr "Semplice strumento per la scansione di documenti"
+msgstr "Semplice strumento per l'acquisizione di documenti"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
+"  Alberto https://launchpad.net/~pajeronda\n"
 "  Alessio Treglia https://launchpad.net/~quadrispro\n"
+"  Claudio Arseni https://launchpad.net/~claudio.arseni\n"
+"  DM74S https://launchpad.net/~danielsan474\n"
 "  Daniele Napolitano https://launchpad.net/~dnax88\n"
 "  Daniele Sapino https://launchpad.net/~daniele-sapino\n"
-"  Danielsan474 https://launchpad.net/~danielsan474\n"
 "  Federico Foschini https://launchpad.net/~undicizeri\n"
 "  Giasone https://launchpad.net/~giasone\n"
-"  Luca Reverberi https://launchpad.net/~ilreve\n"
+"  Giovanni Mottola https://launchpad.net/~trottola-deactivatedaccount\n"
+"  Leonardo Corato https://launchpad.net/~leocor\n"
+"  Luca Reverberi https://launchpad.net/~socketreve\n"
 "  Marco Lazzaroni https://launchpad.net/~marcolazzaroni\n"
 "  Milo Casagrande https://launchpad.net/~milo\n"
 "  Paolo Sammicheli https://launchpad.net/~xdatap1\n"
+"  Sergio Santoro https://launchpad.net/~tauer92\n"
 "  Vincenzo Ninni https://launchpad.net/~wampon\n"
 "  alexinfurs https://launchpad.net/~alexinfurs\n"
-"  suoko https://launchpad.net/~suoko"
+"  lory https://launchpad.net/~lorenzo-themax\n"
+"  matrobriva https://launchpad.net/~matrobriva\n"
+"  phede92 https://launchpad.net/~phede92"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
 msgstr "Salvare il documento prima di uscire?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
-msgstr "Uscire senza salvare"
+msgstr "Esci senza salvare"
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (predefinita)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#: ../src/ui.vala:1292
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (bozza)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
-#, c-format
-msgid "%d dpi"
-msgstr "%d dpi"
-
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (alta risoluzione)"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
-msgstr "%d dpi (predefinita)"
+msgid "%d dpi"
+msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
 msgstr "File mancanti"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
 msgstr "Verificare l'installazione"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
 msgstr "Cambia _scanner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
 msgstr "Automatico"
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
-msgstr "Documento-acquisito.pdf"
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr "Più scura"
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr "Più chiara"
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr "Minore"
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr "Maggiore"
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr "Minima"
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr "Massima"
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "Salvataggio del documento..."
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "Salvataggio pagina %d di %d"
+
+#~ msgid ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ msgstr ""
+#~ "La direzione di acquisizione. Può essere uno dei seguenti valori: \"top-to-"
+#~ "bottom\" (dall'alto in basso), \"bottom-to-top\" (dal basso in alto), \"left-"
+#~ "to-right\" (da sinistra a destra), \"right-to-left\" (da destra a sinistra)"
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "Uso:\n"
+#~ "  %s [DISPOSITIVO...] - Strumento di acquisizione"
+
+#, c-format
+#~ msgid ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+#~ msgstr ""
+#~ "Opzioni d'aiuto:\n"
+#~ "  -d, --debug Visualizza i messaggi di debug\n"
+#~ "  -v, --version Mostra la versione in uso\n"
+#~ "  -h, --help Mostra il menù di aiuto\n"
+#~ "  --help-all Mostra il menù di aiuto completo\n"
+#~ "  --help-gtk Mostra le opzioni di GTK+"
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "Opzioni GTK+:\n"
+#~ "  --class=CLASS                   Classe del programma utilizzata dal "
+#~ "gestore di finestre\n"
+#~ "  --name=NAME                     Nome del programma utilizzato dal gestore "
+#~ "di finestre\n"
+#~ "  --screen=SCREEN                 Screen X da utilizzare\n"
+#~ "  --sync                          Rende le chiamate a X sincrone\n"
+#~ "  --gtk-module=MODULES            Carica moduli GTK+ aggiuntivi\n"
+#~ "  --g-fatal-warnings              Rende fatali tutti gli avvertimenti"
+
+#~ msgid ""
+#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ msgstr ""
+#~ "I lati della pagina da acquisire. Può essere uno dei seguenti: \"entrambi\" "
+#~ "\"fronte\" \"retro\""
+
+#~ msgid ""
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
+#~ msgstr ""
+#~ "Tipo di documento da acquisire. \"text\" per documenti di testo, \"photo\" "
+#~ "per fotografie. Questa impostazione influenza la risoluzione "
+#~ "dell'acquisizione, le impostazioni di colore e la post-produzione."
diff --git a/po/ja.po b/po/ja.po
index c8156e7..c7d37c4 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,538 +7,580 @@ msgid ""
 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-08-30 16:07+0000\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-07-23 09:03+0000\n"
 "Last-Translator: Shushi Kurose <md81bird@hitaki.net>\n"
 "Language-Team: Japanese <ja@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-10-22 04:47+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:45+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "シンプルスキャン"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr "A_4"
+msgid "_Document"
+msgstr "ドキュメント(_D)"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr "スキャン(_A)"
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "一枚のページ(_P)"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:10
 msgid "All Pages From _Feeder"
 msgstr "フィーダより全てのページ(_F)"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr "戻る"
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
-msgstr "切り抜き"
+msgid "_Stop Scan"
+msgstr "スキャン停止(_S)"
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr "選択した範囲の切り抜き"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr "表面"
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr "表面と裏面"
-
-#. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr "US リーガル(_G)"
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr "新規"
-
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr "ページサイズ:"
+msgid "Text"
+msgstr "テキスト"
 
 #. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
+#: ../data/simple-scan.ui.h:16
 msgid "Photo"
 msgstr "写真"
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr "設定"
-
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
-msgstr "左へ回転"
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr "電子メール(_E)"
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr "右へ回転"
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr "ページ(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
+#: ../data/simple-scan.ui.h:22
 msgid "Rotate _Left"
 msgstr "左へ回転(_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
+#: ../data/simple-scan.ui.h:24
 msgid "Rotate _Right"
 msgstr "右へ回転(_R)"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "ページを左回転 (反時計回り)"
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "切り抜き(_C)"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr "ページを右回転 (時計回り)"
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "なし(_N)"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "US レター(_L)"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "US リーガル(_G)"
 
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr "保存"
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr "ドキュメントをファイルに保存"
+msgid "_Custom"
+msgstr "カスタム(_C)"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr "スキャン(_A)"
+msgid "_Rotate Crop"
+msgstr "切り抜きを回転(_R)"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
-msgstr "スキャン"
+msgid "Move Left"
+msgstr ""
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr "原稿をスキャン(_O):"
+msgid "Move Right"
+msgstr ""
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr "スキャン面:"
+msgid "_Help"
+msgstr "ヘルプ(_H)"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
-msgstr "一枚のページをスキャンします"
-
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr "Simple Scan"
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr "一枚のページ(_P)"
+msgid "_Contents"
+msgstr "コンテンツ(_C)"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
 msgstr "新規ドキュメントの作成"
 
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "新規"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "一枚のページをスキャンします"
+
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
-msgstr "停止"
+msgid "Scan"
+msgstr "スキャン"
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr "ドキュメントをファイルに保存"
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "保存"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
 msgid "Stop the current scan"
 msgstr "スキャンを停止します"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr "テキスト"
-
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr "認証(_A)"
+msgid "Stop"
+msgstr "停止"
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
-msgstr "コンテンツ(_C)"
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "ページを左回転 (反時計回り)"
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr "切り抜き(_C)"
+msgid "Rotate Left"
+msgstr "左へ回転"
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr "カスタム(_C)"
+msgid "Rotate the page to the right (clockwise)"
+msgstr "ページを右回転 (時計回り)"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr "ドキュメント(_D)"
+msgid "Rotate Right"
+msgstr "右へ回転"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "選択した範囲の切り抜き"
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
-msgstr "電子メール(_E)"
+msgid "Crop"
+msgstr "切り抜き"
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr "ヘルプ(_H)"
+msgid "_Username for resource:"
+msgstr "リソースに対するユーザ名(_U):"
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr "US レター(_L)"
+msgid "_Password:"
+msgstr "パスワード(_P):"
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr "なし(_N)"
+msgid "_Authorize"
+msgstr "認証(_A)"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr "ページ(_P)"
+msgid "Preferences"
+msgstr "設定"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr "パスワード(_P):"
+msgid "Scan S_ource:"
+msgstr "原稿をスキャン(_O):"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
-msgstr "写真の画素数(_P):"
+msgid "_Text Resolution:"
+msgstr "テキストの画素数(_T):"
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr "切り抜きを回転(_R)"
+msgid "_Photo Resolution:"
+msgstr "写真の画素数(_P):"
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
-msgstr "スキャン停止(_S)"
+msgid "Scan Side:"
+msgstr "スキャン面:"
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
-msgstr "テキストの画素数(_T):"
+msgid "Page Size:"
+msgstr "ページサイズ:"
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
-msgstr "リソースに対するユーザ名(_U):"
+msgid "Brightness:"
+msgstr "明るさ:"
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
-msgstr "ドキュメントをスキャンします"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr "コントラスト:"
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
-msgstr "スキャンするデバイス"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr "品質:"
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
-msgstr "スキャン方向"
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "表面と裏面"
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
-msgstr "ファイルを保存するディレクトリ"
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "表面"
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
-msgstr "10mm単位の用紙の高さ"
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "戻る"
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr "スキャンされる画像の高さ(ピクセル)"
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "ドキュメントをスキャンします"
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
-msgstr "スキャンする面"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "ウィンドウの幅(ピクセル)"
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
-msgstr "写真スキャンの解像度"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "ウィンドウの高さ(ピクセル)"
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
-msgstr "テキストスキャンの解像度"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "アプリケーションのウィンドウを最大化するには TRUE にします"
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
-msgstr "最後にスキャンした画像の解像度"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "スキャンするデバイス"
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
 msgstr "画像を取得する SANE デバイスです。"
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
-msgstr "アプリケーションのウィンドウを最大化するには TRUE にします"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "スキャンするドキュメントの種類"
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
-msgstr ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr "スキャンされる文書の種類。この設定により、画像の解像度、色の深度、事後処理が決定されます。"
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "スキャン方向"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "スキャナの走査方向"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "スキャン画像の幅(ピクセル)"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr "ファイルを保存するディレクトリです。設定されていない場合、標準でドキュメントディレクトリに保存されます。"
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "スキャンされる画像の高さ(ピクセル)"
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 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
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "10mm単位での紙の幅"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "10mm単位の用紙の高さ"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr "10mm単位の紙の高さ (または 0 で自動紙検知)"
 
-#: ../data/simple-scan.schemas.in.h:16
-msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
-msgstr "スキャンする面のことです。次のうちから 1 つ選択できます: '両面' '表面' '裏面'"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr "スキャンの明るさ"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "-100から100までの範囲で明るさを調節する (0は無調整)。"
 
-#: ../data/simple-scan.schemas.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr "スキャンのコントラスト"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "-100から100までの範囲でコントラストを調節する (0は無調整)。"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "最後にスキャンした画像の解像度"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
 msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr "前にスキャンした画像の解像度(DPI)です。"
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "写真をスキャンするときの解像度(DPI)です。"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "テキストスキャンの解像度"
 
-#: ../data/simple-scan.schemas.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "テキストをスキャンするときの解像度(DPI)です。"
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "写真スキャンの解像度"
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "写真をスキャンするときの解像度(DPI)です。"
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
-msgstr "スキャンするドキュメントの種類"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "スキャンする面"
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "スキャンされる面"
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
-msgstr "10mm単位での紙の幅"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "ファイルを保存するディレクトリ"
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
-msgstr "スキャン画像の幅(ピクセル)"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr "ファイルを保存するディレクトリです。設定されていない場合、標準でドキュメントディレクトリに保存されます。"
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
-msgstr "ウィンドウの高さ(ピクセル)"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
-msgstr "ウィンドウの幅(ピクセル)"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
 msgstr "利用可能なスキャナがありません。スキャナを接続してください。"
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
 msgstr "スキャナに接続できません"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
 msgstr "スキャンを開始できません"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
 msgstr "スキャナとの通信に失敗しました"
 
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "リリースバージョンを表示"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "デバッグメッセージを表示"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr "古いバージョンの Simple Scan によって生成されたPDFファイルを修復する"
+
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
 msgstr "スキャンに失敗しました"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
 msgstr ""
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
-msgstr ""
-"使い方:\n"
-"  %s [DEVICE...] - スキャンニング装置"
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[デバイス...] - スキャンユーティリティ"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
-msgstr ""
+msgid "Run '%s --help' to see a full list of available command line options."
+msgstr "'%s --help' を実行すると利用可能なすべてのコマンドラインオプションの一覧が表示されます"
 
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
-#, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
-msgstr ""
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "スキャンされたドキュメント.pdf"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "'%s' にアクセスするにはユーザ名とパスワードが必要です"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
 msgstr "スキャナが検出されていません"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
 msgstr "スキャナが接続されて電源が入っているか確認してください"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr ""
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr ""
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr ""
-
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
 msgstr "名前を付けて保存..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
 msgstr ""
 
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr ""
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr ""
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
 msgstr "ファイルの保存に失敗しました"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
 msgstr ""
 
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "プレビュー用の画像を保存できません"
+
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -555,77 +597,130 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
 msgstr "Simple Scan について"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
 msgstr "ドキュメントのスキャンを行うシンプルなツールです"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
+"  Akira Tanaka https://launchpad.net/~akira-tanaka\n"
+"  Hajime Mizuno https://launchpad.net/~mizuno-as\n"
 "  Jeroen Hoek https://launchpad.net/~mail-jeroenhoek\n"
+"  Jun Kobayashi https://launchpad.net/~jkbys\n"
 "  Kentaro Kazuhama https://launchpad.net/~kazken3\n"
-"  Shushi Kurose https://launchpad.net/~kurokuro"
+"  Koichi Akabe https://launchpad.net/~vbkaisetsu\n"
+"  MANABE Akinari https://launchpad.net/~maaanaari\n"
+"  Shushi Kurose https://launchpad.net/~kuromabo\n"
+"  Tosiki Iga https://launchpad.net/~tosiki-iga"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
 msgstr ""
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
 #, c-format
-msgid "%d dpi (draft)"
+msgid "%d dpi (default)"
 msgstr ""
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1292
 #, c-format
-msgid "%d dpi"
+msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
+msgid "%d dpi"
 msgstr ""
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
 msgstr "ファイルが見つかりません"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
 msgstr "インストールされているか確認してください"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
 msgstr "スキャナを変更(_S)"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
-msgstr "スキャンされたドキュメント.pdf"
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr "暗く"
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr "明るく"
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr ""
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr ""
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr ""
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr ""
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "ドキュメントを保存しています..."
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "%2$dページ中%1$dページを保存しています"
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "使い方:\n"
+#~ "  %s [DEVICE...] - スキャンニング装置"
+
+#~ msgid ""
+#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ msgstr "スキャンする面のことです。次のうちから 1 つ選択できます: '両面' '表面' '裏面'"
diff --git a/po/kk.po b/po/kk.po
new file mode 100644
index 0000000..3b71127
--- /dev/null
+++ b/po/kk.po
@@ -0,0 +1,707 @@
+# Kazakh translation for simple-scan
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the simple-scan package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: simple-scan\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-04-17 06:12+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"Language-Team: Kazakh <kk@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: 2013-09-13 05:45+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
+
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr ""
+
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: ../data/simple-scan.ui.h:4
+msgid "_Document"
+msgstr ""
+
+#. Scan menu item
+#: ../data/simple-scan.ui.h:6
+msgid "Sc_an"
+msgstr ""
+
+#. Toolbar scan menu item to scan a single page from the scanner
+#: ../data/simple-scan.ui.h:8
+msgid "Single _Page"
+msgstr ""
+
+#. Toolbar scan menu item to scan all pages from a document feeder
+#: ../data/simple-scan.ui.h:10
+msgid "All Pages From _Feeder"
+msgstr ""
+
+#. Menu entry to stop current scan
+#: ../data/simple-scan.ui.h:12
+msgid "_Stop Scan"
+msgstr ""
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:14
+msgid "Text"
+msgstr "Мәтін"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:16
+msgid "Photo"
+msgstr "Фото"
+
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr ""
+
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr ""
+
+#. Menu item to rotate page to left (anti-clockwise)
+#: ../data/simple-scan.ui.h:22
+msgid "Rotate _Left"
+msgstr "_Солға бұру"
+
+#. Menu item to rotate page to right (clockwise)
+#: ../data/simple-scan.ui.h:24
+msgid "Rotate _Right"
+msgstr "_Оңға бұру"
+
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "Қ_иып жіберу"
+
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "_Ешнәрсе"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr ""
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr ""
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr ""
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr ""
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr ""
+
+#. Radio button for cropping page to 4x6 inch
+#: ../data/simple-scan.ui.h:40
+msgid "4&#xD7;6"
+msgstr ""
+
+#. Radio button for cropping to custom page size
+#: ../data/simple-scan.ui.h:42
+msgid "_Custom"
+msgstr ""
+
+#. Menu item to rotate the crop area
+#: ../data/simple-scan.ui.h:44
+msgid "_Rotate Crop"
+msgstr ""
+
+#. Menu item to move the selected page to the left
+#: ../data/simple-scan.ui.h:46
+msgid "Move Left"
+msgstr ""
+
+#. Menu item to move the selected page to the right
+#: ../data/simple-scan.ui.h:48
+msgid "Move Right"
+msgstr ""
+
+#. Label on help menu
+#: ../data/simple-scan.ui.h:50
+msgid "_Help"
+msgstr "_Көмек"
+
+#. Help|Contents menu
+#: ../data/simple-scan.ui.h:52
+msgid "_Contents"
+msgstr "Құра_масы"
+
+#. Tooltip for new document button
+#: ../data/simple-scan.ui.h:54
+msgid "Start a new document"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "Жаңа"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr ""
+
+#. Label on scan toolbar item
+#: ../data/simple-scan.ui.h:59
+msgid "Scan"
+msgstr "Іздеу"
+
+#. Tooltip for save toolbar button
+#: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "Сақтау"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
+msgid "Stop the current scan"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:65
+msgid "Stop"
+msgstr "Тоқтау"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: ../data/simple-scan.ui.h:67
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr ""
+
+#. Label on rotate page left (anti-clockwise) item
+#: ../data/simple-scan.ui.h:69
+msgid "Rotate Left"
+msgstr "Солға бұру"
+
+#. Tooltip for rotate right (clockwise) button
+#: ../data/simple-scan.ui.h:71
+msgid "Rotate the page to the right (clockwise)"
+msgstr ""
+
+#. Label on rotate page right (clockwise) item
+#: ../data/simple-scan.ui.h:73
+msgid "Rotate Right"
+msgstr "Оңға бұру"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:75
+msgid "Crop"
+msgstr "Қиып жіберу"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:77
+msgid "_Username for resource:"
+msgstr ""
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:79
+msgid "_Password:"
+msgstr "_Құпия сөз:"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:81
+msgid "_Authorize"
+msgstr ""
+
+#. Title of preferences dialog
+#: ../data/simple-scan.ui.h:83
+msgid "Preferences"
+msgstr "Баптаулары"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:85
+msgid "Scan S_ource:"
+msgstr ""
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:87
+msgid "_Text Resolution:"
+msgstr ""
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:89
+msgid "_Photo Resolution:"
+msgstr ""
+
+#. Label beside scan side combo box
+#: ../data/simple-scan.ui.h:91
+msgid "Scan Side:"
+msgstr ""
+
+#. Label beside page size combo box
+#: ../data/simple-scan.ui.h:93
+msgid "Page Size:"
+msgstr ""
+
+#. Label beside brightness scale
+#: ../data/simple-scan.ui.h:95
+msgid "Brightness:"
+msgstr ""
+
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr ""
+
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr ""
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr ""
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "Бет жағы"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "Сырты"
+
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+msgid "SANE device to acquire images from."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
+msgid ""
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
+msgid ""
+"The height of scanned image in pixels. This value is updated to what the "
+"last scanned page was."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
+msgid "The resolution in dots-per-inch of the previously scanned image."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr ""
+
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:814
+msgid "No scanners available.  Please connect a scanner."
+msgstr ""
+
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:844
+msgid "Unable to connect to scanner"
+msgstr ""
+
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1207
+msgid "Unable to start scan"
+msgstr ""
+
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+msgid "Error communicating with scanner"
+msgstr ""
+
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr ""
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr ""
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:297
+msgid "Failed to scan"
+msgstr ""
+
+#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
+#: ../src/simple-scan.vala:316
+msgid "Scanned Document"
+msgstr ""
+
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr ""
+
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
+#, c-format
+msgid "Run '%s --help' to see a full list of available command line options."
+msgstr ""
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr ""
+
+#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
+#: ../src/ui.vala:159
+#, c-format
+msgid "Username and password required to access '%s'"
+msgstr ""
+
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:202
+msgid "No scanners detected"
+msgstr ""
+
+#. Hint to user on why there are no scanners detected
+#: ../src/ui.vala:204
+msgid "Please check your scanner is connected and powered on"
+msgstr ""
+
+#. Save dialog: Dialog title
+#: ../src/ui.vala:363
+msgid "Save As..."
+msgstr "Қалайша сақтау..."
+
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:377
+msgid "Image Files"
+msgstr ""
+
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:383
+msgid "All Files"
+msgstr "Бүкіл файлдар"
+
+#. 
+#: ../src/ui.vala:388
+msgid "Select File _Type"
+msgstr ""
+
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr ""
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr ""
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr ""
+
+#. Title of error dialog when save failed
+#: ../src/ui.vala:503
+msgid "Failed to save file"
+msgstr ""
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:526
+msgid "If you don't save, changes will be permanently lost."
+msgstr "Сақтамасаңыз, өзгерістер қайтпастай жоғалады."
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:563
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:565
+msgid "Discard Changes"
+msgstr "Өзгерістерді ысырып тастау"
+
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.vala:872
+msgid "Unable to open image preview application"
+msgstr ""
+
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1119
+msgid "Unable to open help file"
+msgstr "Көмек ақпараты файлын ашу мүмкін емес"
+
+#. The license this software is under (GPL3+)
+#: ../src/ui.vala:1130
+msgid ""
+"This program is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 3 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program.  If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+
+#. Title of about dialog
+#: ../src/ui.vala:1133
+msgid "About Simple Scan"
+msgstr ""
+
+#. Description of program
+#: ../src/ui.vala:1136
+msgid "Simple document scanning tool"
+msgstr ""
+
+#: ../src/ui.vala:1145
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  arruah https://launchpad.net/~arruah\n"
+"  jmb_kz https://launchpad.net/~jmb-kz"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1156
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1158
+msgid "Quit without Saving"
+msgstr ""
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr ""
+
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1292
+#, c-format
+msgid "%d dpi (draft)"
+msgstr ""
+
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1295
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr ""
+
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
+#, c-format
+msgid "%d dpi"
+msgstr ""
+
+#. Title of dialog when cannot load required files
+#: ../src/ui.vala:1333
+msgid "Files missing"
+msgstr ""
+
+#. Description in dialog when cannot load required files
+#: ../src/ui.vala:1335
+msgid "Please check your installation"
+msgstr ""
+
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1403
+msgid "Change _Scanner"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1409
+msgid "Automatic"
+msgstr "Авто"
+
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr ""
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr ""
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr ""
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr ""
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr ""
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr ""
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr ""
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr ""
diff --git a/po/km.po b/po/km.po
new file mode 100644
index 0000000..b0d9075
--- /dev/null
+++ b/po/km.po
@@ -0,0 +1,743 @@
+# Khmer translation for simple-scan
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the simple-scan package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: simple-scan\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-04-17 06:12+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"Language-Team: Khmer <km@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: 2013-09-13 05:45+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
+
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "ស្កេន​ធម្មតា"
+
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: ../data/simple-scan.ui.h:4
+msgid "_Document"
+msgstr "ឯកសារ"
+
+#. Scan menu item
+#: ../data/simple-scan.ui.h:6
+msgid "Sc_an"
+msgstr "ស្កេន"
+
+#. Toolbar scan menu item to scan a single page from the scanner
+#: ../data/simple-scan.ui.h:8
+msgid "Single _Page"
+msgstr "ទំព័រ​ម្ខាង"
+
+#. Toolbar scan menu item to scan all pages from a document feeder
+#: ../data/simple-scan.ui.h:10
+msgid "All Pages From _Feeder"
+msgstr "ទំព័រ​ទាំងអស់​ពី​កម្មវិធី​មតិ"
+
+#. Menu entry to stop current scan
+#: ../data/simple-scan.ui.h:12
+msgid "_Stop Scan"
+msgstr "ឈប់​ស្កេន"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:14
+msgid "Text"
+msgstr "អត្ថបទ"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:16
+msgid "Photo"
+msgstr "រូបថត"
+
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr "អ៊ីមែល"
+
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr "ទំព័រ"
+
+#. Menu item to rotate page to left (anti-clockwise)
+#: ../data/simple-scan.ui.h:22
+msgid "Rotate _Left"
+msgstr "បង្វិល​ឆ្វេង"
+
+#. Menu item to rotate page to right (clockwise)
+#: ../data/simple-scan.ui.h:24
+msgid "Rotate _Right"
+msgstr "បង្វិល​ស្ដាំ"
+
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "ច្រឹប"
+
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "គ្មាន"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A6"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "សំបុត្រ"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "ស្រប​ច្បាប់"
+
+#. Radio button for cropping page to 4x6 inch
+#: ../data/simple-scan.ui.h:40
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
+
+#. Radio button for cropping to custom page size
+#: ../data/simple-scan.ui.h:42
+msgid "_Custom"
+msgstr "ផ្ទាល់ខ្លួន"
+
+#. Menu item to rotate the crop area
+#: ../data/simple-scan.ui.h:44
+msgid "_Rotate Crop"
+msgstr "បង្វិល​ការ​ច្រឹប"
+
+#. Menu item to move the selected page to the left
+#: ../data/simple-scan.ui.h:46
+msgid "Move Left"
+msgstr "ផ្លាស់ទី​ទៅ​ឆ្វេង"
+
+#. Menu item to move the selected page to the right
+#: ../data/simple-scan.ui.h:48
+msgid "Move Right"
+msgstr "ផ្លាស់ទី​ទៅ​ស្ដាំ"
+
+#. Label on help menu
+#: ../data/simple-scan.ui.h:50
+msgid "_Help"
+msgstr "ជំនួយ"
+
+#. Help|Contents menu
+#: ../data/simple-scan.ui.h:52
+msgid "_Contents"
+msgstr "មាតិកា"
+
+#. Tooltip for new document button
+#: ../data/simple-scan.ui.h:54
+msgid "Start a new document"
+msgstr "ចាប់ផ្ដើម​ឯកសារ​ថ្មី"
+
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "ថ្មី"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "ស្កេន​ទំព័រ​ទោល​ពី​ម៉ាស៊ីន​ស្កេន"
+
+#. Label on scan toolbar item
+#: ../data/simple-scan.ui.h:59
+msgid "Scan"
+msgstr "ស្កេន"
+
+#. Tooltip for save toolbar button
+#: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr "រក្សាទុក​ឯកសារ​ទៅ​ឯកសារ"
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "រក្សាទុក"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
+msgid "Stop the current scan"
+msgstr "បញ្ឈប់​ការ​ស្កេន​បច្ចុប្បន្ន"
+
+#: ../data/simple-scan.ui.h:65
+msgid "Stop"
+msgstr "ឈប់"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: ../data/simple-scan.ui.h:67
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "បង្វិល​ទំព័រ​ទៅ​ឆ្វេង (ច្រាស​ទ្រនិច​នាឡិកា)"
+
+#. Label on rotate page left (anti-clockwise) item
+#: ../data/simple-scan.ui.h:69
+msgid "Rotate Left"
+msgstr "បង្វិល​ឆ្វេង"
+
+#. Tooltip for rotate right (clockwise) button
+#: ../data/simple-scan.ui.h:71
+msgid "Rotate the page to the right (clockwise)"
+msgstr "បង្វិល​ទំព័រ​ទៅ​ស្ដាំ (ស្រប​ទ្រនិច​នាឡិកា)"
+
+#. Label on rotate page right (clockwise) item
+#: ../data/simple-scan.ui.h:73
+msgid "Rotate Right"
+msgstr "បង្វិល​ស្ដាំ"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "ច្រឹប​ទំព័រ​ដែល​បាន​ជ្រើស"
+
+#: ../data/simple-scan.ui.h:75
+msgid "Crop"
+msgstr "ច្រឹប"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:77
+msgid "_Username for resource:"
+msgstr "ឈ្មោះ​អ្នកប្រើ​ធនធាន ៖"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:79
+msgid "_Password:"
+msgstr "ពាក្យសម្ងាត់ ៖"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:81
+msgid "_Authorize"
+msgstr "ការ​អនុញ្ញាត"
+
+#. Title of preferences dialog
+#: ../data/simple-scan.ui.h:83
+msgid "Preferences"
+msgstr "ចំណូលចិត្ត"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:85
+msgid "Scan S_ource:"
+msgstr "ស្កេន​ប្រភព ៖"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:87
+msgid "_Text Resolution:"
+msgstr "គុណភាព​បង្ហាញ​អត្ថបទ ៖"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:89
+msgid "_Photo Resolution:"
+msgstr "គុណភាព​បង្ហាញ​រូបថត ៖"
+
+#. Label beside scan side combo box
+#: ../data/simple-scan.ui.h:91
+msgid "Scan Side:"
+msgstr "ស្កេន​ចំហៀង ៖"
+
+#. Label beside page size combo box
+#: ../data/simple-scan.ui.h:93
+msgid "Page Size:"
+msgstr "ទំហំ​ទំព័រ ៖"
+
+#. Label beside brightness scale
+#: ../data/simple-scan.ui.h:95
+msgid "Brightness:"
+msgstr "ពន្លឺ ៖"
+
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr "កម្រិត​ពណ៌ ៖"
+
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr "គុណភាព ៖"
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "មុខ នឹង​ក្រោយ"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "មុខ"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "ថយក្រោយ"
+
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "ស្កេន​ឯកសារ"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "ទទឹង​បង្អួច​គិតជា​ភិកសែល"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "កម្ពស់​បង្អួច​គិតជា​ភិកសែល"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "ពិត​ប្រសិនបើ​បង្អួច​កម្មវិធី​ត្រូវ​បាន​បង្រួម​អតិបរមា"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "ឧបករណ៍​ដែល​ត្រូវ​ស្កេន"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+msgid "SANE device to acquire images from."
+msgstr "ឧបករណ៍ SANE ដើម្បី​ទៅ​យក​រូបភាព ។"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "ប្រភេទ​ឯកសារ​ដែល​កំពុង​ត្រូវ​បាន​ស្កេន"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"ប្រភេទ​ឯកសារ​ដែល​កំពុង​ត្រូវ​បាន​ស្កេន ។ "
+"ការ​កំណត់​នេះ​អាស្រ័យ​ទៅលើ​គុណភាព​បង្ហាញ ពណ៌ "
+"និង​ការ​ដំណើរការ​ជាមុន​របស់​ម៉ាស៊ីន​ស្កេន ។"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "ទិស​នៃ​ការ​ស្កេន"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "ទិស​ម៉ាស៊ីន​ស្កេន​កាត់តាម​ទំព័រ​ដែល​បាន​ស្កេន ។"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "ទទឹង​រូបភាព​ដែល​បាន​ស្កេន​គិតជា​ភីកសែល"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
+msgid ""
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
+msgstr ""
+"ទទឹង​រូបភាព​ដែល​បាន​ស្កេន​គិតជា​ភីកសែល ។ "
+"តម្លៃ​នេះ​ត្រូវ​បាន​ធ្វើ​បច្ចុប្បន្នភាព​ទៅកាន់​អ្វី​ដែល​ជា​ទំព័រ​ស្កេន​ចុងក្រ"
+"ោយ ។"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "កម្ពស់​រូបភាព​ដែល​បាន​ស្កេន​គិតជា​ភីកសែល"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
+msgid ""
+"The height of scanned image in pixels. This value is updated to what the "
+"last scanned page was."
+msgstr ""
+"កម្ពស់​រូបភាព​ដែល​បាន​ស្កេន​គិតជា​ភីកសែល ។ "
+"តម្លៃ​នេះ​ត្រូវ​បាន​ធ្វើ​បច្ចុប្បន្នភាព​ទៅកាន់​អ្វី​ដែល​ជា​ទំព័រ​ស្កេន​ចុងក្រ"
+"ោយ ។"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "ទទឹង​ក្រដាស ១/១០ ម.ម"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr "ទទឹង​ក្រដាស ១/១០ ម.ម. (ឬ ០ សម្រាប់​ទិស​ក្រដាស​ស្វ័យប្រវត្តិ) ។"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "កម្ពស់​ក្រដាស ១/១០ ម.ម."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr "កម្ពស់​ក្រដាស ១/១០ ម.ម. (ឬ ០ សម្រាប់​ទិស​ក្រដាស​ស្វ័យប្រវត្តិ) ។"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr "ពន្លឺ​វិភាគ​រក"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "ការ​កែតម្រូវ​ពន្លឺ​ពី -១០០ ដល់ ១០០ (០ នឹង​គ្មាន)។"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr "កម្រិត​ពណ៌​វិភាគរក"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "ការ​កែតម្រូវ​កម្រិត​ពណ៌​ពី -១០០ ដល់ ១០០ (០ នឹង​គ្មាន)។"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "គុណភាព​បង្ហាញ​សម្រាប់​រូបភាព​ដែល​បាន​ស្កេន​ចុងក្រោយ"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
+msgid "The resolution in dots-per-inch of the previously scanned image."
+msgstr ""
+"គុណភាព​បង្ហាញ​គិតជា​ចំណុច​ក្នុង​មួយ​អ៊ិន្ឈ៍ នៃ​រូបភាព​ដែល​បាន​ស្កេន​មុន ។"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "គុណភាព​បង្ហាញ​សម្រាប់​ការ​ស្កេន​អត្ថបទ"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr ""
+"គុណភាព​បង្ហាញ​គិតជា​ចំណុច​ក្នុង​មួយ​អ៊ិន្ឈ៍ "
+"ដែល​ត្រូវ​ប្រើ​នៅ​ពេល​ស្កេន​អត្ថបទ ។"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "គុណភាព​បង្ហាញ​សម្រាប់​ការ​ស្កេន​រូបថត"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr ""
+"គុណភាព​បង្ហាញ​គិតជា​ចំណុច​ក្នុង​មួយ​អ៊ិន្ឈ៍ "
+"ដែល​ត្រូវ​ប្រើ​នៅ​ពេល​ស្កេន​រូបថត ។"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "ចំហៀង​ទំព័រ​ដែល​ត្រូវ​ស្កេន"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "ចំហៀង​ទំព័រ​ដែល​ត្រូវ​ស្កេន ។"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "ថត​ដែល​ត្រូវ​រក្សាទុក​ឯកសារ"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"ថត​ដែល​ត្រូវ​រក្សាទុក​ឯកសារ ។ "
+"លំនាំដើម​ទៅកាន់​ថត​ឯកសារ​ប្រសិនបើ​មិន​បាន​កំណត់ ។"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr "តម្លៃ​គុណភាព​​ប្រើ​សម្រាប់ JPEG compression"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr "តម្លៃ​គុណភាព​ប្រើ​សម្រាប់ JPEG compression ។"
+
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:814
+msgid "No scanners available.  Please connect a scanner."
+msgstr "ពុំ​មាន​ម៉ាស៊ីន​ស្កេន​ទេ សូម​តភ្ជាប់​ម៉ាស៊ីន​ស្កេន ។"
+
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:844
+msgid "Unable to connect to scanner"
+msgstr "មិន​អាច​តភ្ជាប់​ម៉ាស៊ីន​ស្កេន​បាន​ទេ"
+
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1207
+msgid "Unable to start scan"
+msgstr "មិន​អាច​ចាប់ផ្ដើម​ស្កេន​បាន​ទេ"
+
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+msgid "Error communicating with scanner"
+msgstr "កំហុស​ក្នុង​ការ​ទាក់ទង​ទៅកាន់​ម៉ាស៊ីន​ស្កេន"
+
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "បង្ហាញ​កំណែ​ការ​ចេញផ្សាយ"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "បោះពុម្ព​សារ​បំបាត់​កំហុស"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+"ជួសជុល​ឯកសារ PDF ដែល​បាន​បង្កើត​ជាមួយ​កំណែ​ចាស់​របស់​ម៉ាស៊ីន​ស្កេន​ធម្មតា"
+
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:297
+msgid "Failed to scan"
+msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ស្កេន"
+
+#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
+#: ../src/simple-scan.vala:316
+msgid "Scanned Document"
+msgstr "ឯកសារ​ដែល​បាន​ស្កេន"
+
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[ឧបករណ៍...] - ការ​ស្កេន​ឧបករណ៍​ប្រើប្រាស់"
+
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
+#, c-format
+msgid "Run '%s --help' to see a full list of available command line options."
+msgstr ""
+"ដំណើរការ '%s --help' ដើម្បី​មើល​បញ្ជី​ពេញលេញ​នៃ​បន្ទាត់​បញ្ជា​ដែល​មាន ។"
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "Document.pdf ដែល​បាន​ស្កេន"
+
+#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
+#: ../src/ui.vala:159
+#, c-format
+msgid "Username and password required to access '%s'"
+msgstr "ទាមទារ​ឈ្មោះ​អ្នកប្រើ និង​ពាក្យសម្ងាត់​ដើម្បី​ចូលដំណើរការ '%s'"
+
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:202
+msgid "No scanners detected"
+msgstr "រក​មិន​ឃើញ​ម៉ាស៊ីន​ស្កេន"
+
+#. Hint to user on why there are no scanners detected
+#: ../src/ui.vala:204
+msgid "Please check your scanner is connected and powered on"
+msgstr ""
+"សូម​ពិនិត្យមើល​ម៉ាស៊ីន​ស្កេន​របស់​អ្នក​ថា​តើ​បាន​តភ្ជាប់ "
+"និង​បើក​កុងតាក់​ហើយ​ឬនៅ"
+
+#. Save dialog: Dialog title
+#: ../src/ui.vala:363
+msgid "Save As..."
+msgstr "រក្សាទុក​ជា..."
+
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:377
+msgid "Image Files"
+msgstr "ឯកសារ​រូបភាព"
+
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:383
+msgid "All Files"
+msgstr "ឯកសារ​ទាំងអស់"
+
+#. 
+#: ../src/ui.vala:388
+msgid "Select File _Type"
+msgstr "ជ្រើស​ប្រភេទ​ឯកសារ"
+
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF (ឯកសារ​ច្រើន​ទំព័រ)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (បាន​បង្ហាប់)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (គ្មាន​ការ​បាត់បង់)"
+
+#. Title of error dialog when save failed
+#: ../src/ui.vala:503
+msgid "Failed to save file"
+msgstr "បាន​បរាជ័យ​ក្នុង​ការ​រក្សាទុក​ឯកសារ"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:526
+msgid "If you don't save, changes will be permanently lost."
+msgstr ""
+"ប្រសិនបើ​អ្នក​មិន​រក្សាទុក​ទេ "
+"ការ​ផ្លាស់ប្ដូរ​ទាំងឡាយ​និង​ត្រូវ​បាន​បាត់បង់​ជា​អចិន្ត្រៃយ៍ ។"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:563
+msgid "Save current document?"
+msgstr "រក្សាទុក​ឯកសារ​បច្ចុប្បន្ន ?"
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:565
+msgid "Discard Changes"
+msgstr "បោះបង់​ការ​ផ្លាស់ប្ដូរ"
+
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "មិន​អាច​រក្សាទុក​រូបភាព​សម្រាប់​ការ​មើល​ជាមុន​បាន​ទេ"
+
+#. Error message display when unable to preview image
+#: ../src/ui.vala:872
+msgid "Unable to open image preview application"
+msgstr "មិន​អាច​បើក​កម្មវិធី​មើល​រូបភាព​ជាមុន​បាន​ទេ"
+
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1119
+msgid "Unable to open help file"
+msgstr "មិន​អាច​បើក​ឯកសារ​ជំនួយ​បាន​ទេ"
+
+#. The license this software is under (GPL3+)
+#: ../src/ui.vala:1130
+msgid ""
+"This program is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 3 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program.  If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+"នេះ​ជា​កម្មវិធី​ឥត​បង់​ថ្លៃ ៖ អ្នក​អាច​ចែកចាយ និង/ឬ​កែប្រែ​វា​បាន\n"
+"ក្រោម​លក្ខខណ្ឌ​អាជ្ញាប័ណ្ណ​សាធារណៈ​ទូទៅ GNU ដែល​បាន​ចេញផ្សាយ​ដោយ\n"
+"មូលនិធិ​កម្មវិធី​ឥត​បង់​ថ្លៃ ទាំង​អាជ្ញាប័ណ្ណ​កំណែ ៣ ឬ\n"
+"(នៅ​ជម្រើស​របស់​អ្នក) កំណែ​ក្រោយ​ទៀត​ក៏ដោយ ។\n"
+"\n"
+"កម្មវិធី​នេះ​ត្រូវ​បាន​ចែកចាយ​ដោយ​សង្ឃឹម​ថា​នឹង​មាន​ប្រយោជន៍\n"
+"ប៉ុន្តែ​ដោយ​គ្មាន​ការ​ធានា​ណាមួយ​ទេ សូម្បីតែ​ការ​ធានា​ដែល​បាន​បញ្ជាក់​ដោយ\n"
+"ការ​ធ្វើ​ជំនួញ ឬ​ភាព​សមរម្យ​សម្រាប់​គោលបំណង​ជាក់លាក់​ក៏ដោយ ។ សូម​មើល\n"
+"អាជ្ញាប័ណ្ណ​សាធារណៈ​ទូទៅ GNU សម្រាប់​សេចក្ដី​លម្អិត ។\n"
+"\n"
+"អ្នក​គួរតែ​បាន​ទទួល​ច្បាប់​ចម្លង​នៃ​អាជ្ញាប័ណ្ណ​សាធារណៈ​ទូទៅ GNU\n"
+"ជាមួយ​កម្មវិធី​នេះ ។ ប្រសិនបើ​មិន​បាន​ទទួល​ទេ "
+"សូម​មើល<http://www.gnu.org/licenses/> ។"
+
+#. Title of about dialog
+#: ../src/ui.vala:1133
+msgid "About Simple Scan"
+msgstr "អំពី​ការ​ស្កេន​ធម្មតា"
+
+#. Description of program
+#: ../src/ui.vala:1136
+msgid "Simple document scanning tool"
+msgstr "ឧបករណ៍​ស្កេន​ធម្មតា"
+
+#: ../src/ui.vala:1145
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Khoem Sokhem https://launchpad.net/~khoemsokhem\n"
+"  Noy Shoung https://launchpad.net/~noyshoung\n"
+"  Seng Sutha https://launchpad.net/~sutha"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1156
+msgid "Save document before quitting?"
+msgstr "រក្សាទុក​ឯកសារ​មុន​ពេល​បិទ​ឬ ?"
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1158
+msgid "Quit without Saving"
+msgstr "បិទ​ដោយ​មិន​រក្សាទុក"
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (លំនាំដើម)"
+
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1292
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d dpi (ពង្រាង)"
+
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1295
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d dpi (គុណភាព​បង្ហាញ​ខ្ពស់)"
+
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
+#, c-format
+msgid "%d dpi"
+msgstr "%d dpi"
+
+#. Title of dialog when cannot load required files
+#: ../src/ui.vala:1333
+msgid "Files missing"
+msgstr "បាត់​ឯកសារ"
+
+#. Description in dialog when cannot load required files
+#: ../src/ui.vala:1335
+msgid "Please check your installation"
+msgstr "សូម​ពិនិត្យមើល​ការ​ដំឡើង​របស់​អ្នក"
+
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1403
+msgid "Change _Scanner"
+msgstr "ប្ដូរ​ម៉ាស៊ីន​ស្កេន"
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1409
+msgid "Automatic"
+msgstr "ស្វ័យប្រវត្តិ"
+
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr "ងងឹត"
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr "ស្រាល"
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr "តិចជាង"
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr "ផ្សេងទៀត"
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr "អប្បបរមា"
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr "អតិបរមា"
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "កំពុង​រក្សាទុក​ឯកសារ..."
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "រក្សាទុក​ទំព័រ %d ផុត​សម័យ %d"
diff --git a/po/ky.po b/po/ky.po
new file mode 100644
index 0000000..fc30739
--- /dev/null
+++ b/po/ky.po
@@ -0,0 +1,706 @@
+# Kirghiz translation for simple-scan
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the simple-scan package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: simple-scan\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-04-17 06:12+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"Language-Team: Kirghiz <ky@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: 2013-09-13 05:45+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
+
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr ""
+
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: ../data/simple-scan.ui.h:4
+msgid "_Document"
+msgstr ""
+
+#. Scan menu item
+#: ../data/simple-scan.ui.h:6
+msgid "Sc_an"
+msgstr ""
+
+#. Toolbar scan menu item to scan a single page from the scanner
+#: ../data/simple-scan.ui.h:8
+msgid "Single _Page"
+msgstr ""
+
+#. Toolbar scan menu item to scan all pages from a document feeder
+#: ../data/simple-scan.ui.h:10
+msgid "All Pages From _Feeder"
+msgstr ""
+
+#. Menu entry to stop current scan
+#: ../data/simple-scan.ui.h:12
+msgid "_Stop Scan"
+msgstr ""
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:14
+msgid "Text"
+msgstr ""
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:16
+msgid "Photo"
+msgstr ""
+
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr ""
+
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr ""
+
+#. Menu item to rotate page to left (anti-clockwise)
+#: ../data/simple-scan.ui.h:22
+msgid "Rotate _Left"
+msgstr ""
+
+#. Menu item to rotate page to right (clockwise)
+#: ../data/simple-scan.ui.h:24
+msgid "Rotate _Right"
+msgstr ""
+
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr ""
+
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr ""
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr ""
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr ""
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr ""
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr ""
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr ""
+
+#. Radio button for cropping page to 4x6 inch
+#: ../data/simple-scan.ui.h:40
+msgid "4&#xD7;6"
+msgstr ""
+
+#. Radio button for cropping to custom page size
+#: ../data/simple-scan.ui.h:42
+msgid "_Custom"
+msgstr ""
+
+#. Menu item to rotate the crop area
+#: ../data/simple-scan.ui.h:44
+msgid "_Rotate Crop"
+msgstr ""
+
+#. Menu item to move the selected page to the left
+#: ../data/simple-scan.ui.h:46
+msgid "Move Left"
+msgstr ""
+
+#. Menu item to move the selected page to the right
+#: ../data/simple-scan.ui.h:48
+msgid "Move Right"
+msgstr ""
+
+#. Label on help menu
+#: ../data/simple-scan.ui.h:50
+msgid "_Help"
+msgstr ""
+
+#. Help|Contents menu
+#: ../data/simple-scan.ui.h:52
+msgid "_Contents"
+msgstr ""
+
+#. Tooltip for new document button
+#: ../data/simple-scan.ui.h:54
+msgid "Start a new document"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr ""
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr ""
+
+#. Label on scan toolbar item
+#: ../data/simple-scan.ui.h:59
+msgid "Scan"
+msgstr ""
+
+#. Tooltip for save toolbar button
+#: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr ""
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
+msgid "Stop the current scan"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:65
+msgid "Stop"
+msgstr ""
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: ../data/simple-scan.ui.h:67
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr ""
+
+#. Label on rotate page left (anti-clockwise) item
+#: ../data/simple-scan.ui.h:69
+msgid "Rotate Left"
+msgstr ""
+
+#. Tooltip for rotate right (clockwise) button
+#: ../data/simple-scan.ui.h:71
+msgid "Rotate the page to the right (clockwise)"
+msgstr ""
+
+#. Label on rotate page right (clockwise) item
+#: ../data/simple-scan.ui.h:73
+msgid "Rotate Right"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:75
+msgid "Crop"
+msgstr ""
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:77
+msgid "_Username for resource:"
+msgstr ""
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:79
+msgid "_Password:"
+msgstr ""
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:81
+msgid "_Authorize"
+msgstr ""
+
+#. Title of preferences dialog
+#: ../data/simple-scan.ui.h:83
+msgid "Preferences"
+msgstr ""
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:85
+msgid "Scan S_ource:"
+msgstr ""
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:87
+msgid "_Text Resolution:"
+msgstr ""
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:89
+msgid "_Photo Resolution:"
+msgstr ""
+
+#. Label beside scan side combo box
+#: ../data/simple-scan.ui.h:91
+msgid "Scan Side:"
+msgstr ""
+
+#. Label beside page size combo box
+#: ../data/simple-scan.ui.h:93
+msgid "Page Size:"
+msgstr ""
+
+#. Label beside brightness scale
+#: ../data/simple-scan.ui.h:95
+msgid "Brightness:"
+msgstr ""
+
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr ""
+
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr ""
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr ""
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr ""
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+msgid "SANE device to acquire images from."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
+msgid ""
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
+msgid ""
+"The height of scanned image in pixels. This value is updated to what the "
+"last scanned page was."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
+msgid "The resolution in dots-per-inch of the previously scanned image."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr ""
+
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:814
+msgid "No scanners available.  Please connect a scanner."
+msgstr ""
+
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:844
+msgid "Unable to connect to scanner"
+msgstr ""
+
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1207
+msgid "Unable to start scan"
+msgstr ""
+
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+msgid "Error communicating with scanner"
+msgstr ""
+
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr ""
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr ""
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:297
+msgid "Failed to scan"
+msgstr ""
+
+#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
+#: ../src/simple-scan.vala:316
+msgid "Scanned Document"
+msgstr ""
+
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr ""
+
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
+#, c-format
+msgid "Run '%s --help' to see a full list of available command line options."
+msgstr ""
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr ""
+
+#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
+#: ../src/ui.vala:159
+#, c-format
+msgid "Username and password required to access '%s'"
+msgstr ""
+
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:202
+msgid "No scanners detected"
+msgstr ""
+
+#. Hint to user on why there are no scanners detected
+#: ../src/ui.vala:204
+msgid "Please check your scanner is connected and powered on"
+msgstr ""
+
+#. Save dialog: Dialog title
+#: ../src/ui.vala:363
+msgid "Save As..."
+msgstr ""
+
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:377
+msgid "Image Files"
+msgstr ""
+
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:383
+msgid "All Files"
+msgstr ""
+
+#. 
+#: ../src/ui.vala:388
+msgid "Select File _Type"
+msgstr ""
+
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr ""
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr ""
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr ""
+
+#. Title of error dialog when save failed
+#: ../src/ui.vala:503
+msgid "Failed to save file"
+msgstr ""
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:526
+msgid "If you don't save, changes will be permanently lost."
+msgstr ""
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:563
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:565
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.vala:872
+msgid "Unable to open image preview application"
+msgstr ""
+
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1119
+msgid "Unable to open help file"
+msgstr ""
+
+#. The license this software is under (GPL3+)
+#: ../src/ui.vala:1130
+msgid ""
+"This program is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 3 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program.  If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+
+#. Title of about dialog
+#: ../src/ui.vala:1133
+msgid "About Simple Scan"
+msgstr ""
+
+#. Description of program
+#: ../src/ui.vala:1136
+msgid "Simple document scanning tool"
+msgstr ""
+
+#: ../src/ui.vala:1145
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Saltanat Osmonova https://launchpad.net/~salta007"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1156
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1158
+msgid "Quit without Saving"
+msgstr ""
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr ""
+
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1292
+#, c-format
+msgid "%d dpi (draft)"
+msgstr ""
+
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1295
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr ""
+
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
+#, c-format
+msgid "%d dpi"
+msgstr ""
+
+#. Title of dialog when cannot load required files
+#: ../src/ui.vala:1333
+msgid "Files missing"
+msgstr ""
+
+#. Description in dialog when cannot load required files
+#: ../src/ui.vala:1335
+msgid "Please check your installation"
+msgstr ""
+
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1403
+msgid "Change _Scanner"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1409
+msgid "Automatic"
+msgstr ""
+
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr ""
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr ""
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr ""
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr ""
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr ""
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr ""
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr ""
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr ""
diff --git a/po/lt.po b/po/lt.po
index 51ae715..5d28d78 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,35 +7,34 @@ msgid ""
 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-01-26 22:27+0000\n"
-"Last-Translator: Launchpad Translations Administrators "
-"<rosetta@launchpad.net>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-07-23 09:03+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Lithuanian <lt@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-10-22 04:47+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:45+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
 msgstr ""
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
+msgid "_Document"
 msgstr ""
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
+msgid "Sc_an"
 msgstr ""
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
+msgid "Single _Page"
 msgstr ""
 
 #. Toolbar scan menu item to scan all pages from a document feeder
@@ -43,501 +42,550 @@ msgstr ""
 msgid "All Pages From _Feeder"
 msgstr ""
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr ""
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
+msgid "_Stop Scan"
 msgstr ""
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
+msgid "Text"
 msgstr ""
 
-#. Combo box label for scanning the front side of a page
+#. Combo box label for photo scan mode
 #: ../data/simple-scan.ui.h:16
-msgid "Front"
+msgid "Photo"
 msgstr ""
 
-#. Combo box label for scanning both sides of a page
+#. Label on email menu item
 #: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
+msgid "_Email"
 msgstr ""
 
-#. Radio button for cropping to page to US legal size
+#. Page menu (contains action for each page, e.g. delete, crop)
 #: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr ""
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
+msgid "_Page"
 msgstr ""
 
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
+#. Menu item to rotate page to left (anti-clockwise)
+#: ../data/simple-scan.ui.h:22
+msgid "Rotate _Left"
 msgstr ""
 
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
-msgid "Photo"
+#. Menu item to rotate page to right (clockwise)
+#: ../data/simple-scan.ui.h:24
+msgid "Rotate _Right"
 msgstr ""
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
 msgstr ""
 
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
 msgstr ""
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
 msgstr ""
 
-#. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
-msgid "Rotate _Left"
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
 msgstr ""
 
-#. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
-msgid "Rotate _Right"
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
 msgstr ""
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
 msgstr ""
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
 msgstr ""
 
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
+msgid "4&#xD7;6"
 msgstr ""
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
+msgid "_Custom"
 msgstr ""
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
+msgid "_Rotate Crop"
 msgstr ""
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
-msgstr ""
+msgid "Move Left"
+msgstr "Perkelti kairėn"
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr ""
+msgid "Move Right"
+msgstr "Perkelti dešinėn"
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
+msgid "_Help"
 msgstr ""
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
+msgid "_Contents"
 msgstr ""
 
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
+#. Tooltip for new document button
+#: ../data/simple-scan.ui.h:54
+msgid "Start a new document"
 msgstr ""
 
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
+#: ../data/simple-scan.ui.h:55
+msgid "New"
 msgstr ""
 
-#. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
-msgid "Start a new document"
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
 msgstr ""
 
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
+msgid "Scan"
 msgstr ""
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
-msgid "Stop the current scan"
+msgid "Save document to a file"
 msgstr ""
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr ""
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
+msgid "Stop the current scan"
 msgstr ""
 
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
+msgid "Stop"
 msgstr ""
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
+msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
+msgid "Rotate Left"
 msgstr ""
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
+msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
+msgid "Rotate Right"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
 msgstr ""
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
+msgid "Crop"
 msgstr ""
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
+msgid "_Username for resource:"
 msgstr ""
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
+msgid "_Password:"
 msgstr ""
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
+msgid "_Authorize"
 msgstr ""
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
+msgid "Preferences"
 msgstr ""
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr ""
+msgid "Scan S_ource:"
+msgstr "Skaitymo š_altinis:"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
+msgid "_Text Resolution:"
 msgstr ""
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
+msgid "_Photo Resolution:"
 msgstr ""
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
+msgid "Scan Side:"
 msgstr ""
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
+msgid "Page Size:"
 msgstr ""
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
+msgid "Brightness:"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
+"Nuskaitomo dokumento tipas. Ši nuostata apsprendžia skaitymo skiriamąją "
+"gebą, spalvas ir baigiamąjį apdorojimą."
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "Skaitytuvo kryptis per skaitomą puslapį."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 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
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
 msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "Puslapio pusė, kurią nuskaityti."
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
 msgstr ""
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
 msgstr ""
 
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Rodyti leidimo versiją"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Išvesti derinimo pranešimus"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+"Pataisyti PDF failus sugeneruotus su senesnėmis „Paprasto skenavimo“ "
+"versijomis"
+
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
 msgstr ""
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
 msgstr ""
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
-msgstr ""
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[ĮTAISAS...] - skaitymo paslaugų programa"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
+msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
+"Norėdami pamatyti komandų eilutės parametrų sąrašą, paleiskite „%s --help“."
 
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
-#, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr ""
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr ""
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr ""
-
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
 msgstr ""
 
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr ""
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr ""
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
-msgstr ""
+msgstr "Jeigu neišsaugosite, pakeitimai bus nesugrąžinamai prarasti."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
-msgstr ""
+msgstr "Išsaugoti šį dokumentą?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
-msgstr ""
+msgstr "Atmesti pakeitimus"
+
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "Nepavyko išsaugoti paveikslo peržiūrai"
 
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -554,76 +602,116 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
+"  Aurimas Fišeras https://launchpad.net/~aurimas-gmail\n"
+"  Johnsonas https://launchpad.net/~uran54\n"
+"  Launchpad Translations Administrators https://launchpad.net/~rosetta\n"
+"  Mantas Kriaučiūnas https://launchpad.net/~mantas\n"
+"  Rytis Ūsalis https://launchpad.net/~rytis-usalis\n"
 "  Vincas Dargis https://launchpad.net/~talkless\n"
 "  romasg https://launchpad.net/~romasg"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
-msgstr ""
+msgstr "Išsaugoti dokumentą prieš išeinant iš programos?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
-msgstr ""
+msgstr "Išeiti neišsaugant"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
 #, c-format
-msgid "%d dpi (draft)"
+msgid "%d dpi (default)"
 msgstr ""
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1292
 #, c-format
-msgid "%d dpi"
+msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
+msgid "%d dpi"
 msgstr ""
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
 msgstr ""
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
+msgstr "Automatinis"
+
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
 msgstr ""
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
 msgstr ""
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr ""
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr ""
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr ""
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr ""
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "Saugomas dokumentas..."
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "Saugomas puslapis %d iš %d"
diff --git a/po/lv.po b/po/lv.po
new file mode 100644
index 0000000..08f3575
--- /dev/null
+++ b/po/lv.po
@@ -0,0 +1,730 @@
+# Latvian translation for simple-scan
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the simple-scan package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: simple-scan\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-10-07 21:28+0000\n"
+"Last-Translator: Rūdolfs Mazurs <Unknown>\n"
+"Language-Team: Latvian <lv@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: 2013-09-13 05:45+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
+
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Vienkārša skenēšana"
+
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: ../data/simple-scan.ui.h:4
+msgid "_Document"
+msgstr "_Dokuments"
+
+#. Scan menu item
+#: ../data/simple-scan.ui.h:6
+msgid "Sc_an"
+msgstr "Sk_enēt"
+
+#. Toolbar scan menu item to scan a single page from the scanner
+#: ../data/simple-scan.ui.h:8
+msgid "Single _Page"
+msgstr "Viena la_pa"
+
+#. Toolbar scan menu item to scan all pages from a document feeder
+#: ../data/simple-scan.ui.h:10
+msgid "All Pages From _Feeder"
+msgstr "Visas lapas no _padeves"
+
+#. Menu entry to stop current scan
+#: ../data/simple-scan.ui.h:12
+msgid "_Stop Scan"
+msgstr "Apturēt _skenēšanu"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:14
+msgid "Text"
+msgstr "Teksts"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:16
+msgid "Photo"
+msgstr "Foto"
+
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr "_E-pasts"
+
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr "La_pa"
+
+#. Menu item to rotate page to left (anti-clockwise)
+#: ../data/simple-scan.ui.h:22
+msgid "Rotate _Left"
+msgstr "Pagriezt pa _kreisi"
+
+#. Menu item to rotate page to right (clockwise)
+#: ../data/simple-scan.ui.h:24
+msgid "Rotate _Right"
+msgstr "Pag_riezt pa labi"
+
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "Ap_cirst"
+
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "_Bez"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "_Letter"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "Le_gal"
+
+#. Radio button for cropping page to 4x6 inch
+#: ../data/simple-scan.ui.h:40
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
+
+#. Radio button for cropping to custom page size
+#: ../data/simple-scan.ui.h:42
+msgid "_Custom"
+msgstr "_Pielāgots"
+
+#. Menu item to rotate the crop area
+#: ../data/simple-scan.ui.h:44
+msgid "_Rotate Crop"
+msgstr "Pag_riezt apciršanu"
+
+#. Menu item to move the selected page to the left
+#: ../data/simple-scan.ui.h:46
+msgid "Move Left"
+msgstr "Pārvietot pa kreisi"
+
+#. Menu item to move the selected page to the right
+#: ../data/simple-scan.ui.h:48
+msgid "Move Right"
+msgstr "Pārvietot pa labi"
+
+#. Label on help menu
+#: ../data/simple-scan.ui.h:50
+msgid "_Help"
+msgstr "_Palīdzība"
+
+#. Help|Contents menu
+#: ../data/simple-scan.ui.h:52
+msgid "_Contents"
+msgstr "_Saturs"
+
+#. Tooltip for new document button
+#: ../data/simple-scan.ui.h:54
+msgid "Start a new document"
+msgstr "Sākt jaunu dokumentu"
+
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "Jauns"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "Ieskenēt vienu lapu no skenera"
+
+#. Label on scan toolbar item
+#: ../data/simple-scan.ui.h:59
+msgid "Scan"
+msgstr "Skenēt"
+
+#. Tooltip for save toolbar button
+#: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr "Saglabāt dokumentu datnē"
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "Saglabāt"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
+msgid "Stop the current scan"
+msgstr "Apturēt pašreizējo skenēšanu"
+
+#: ../data/simple-scan.ui.h:65
+msgid "Stop"
+msgstr "Apturēt"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: ../data/simple-scan.ui.h:67
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Pagriezt lapu pa kreisi (pretēji pulksteņa rādītāja virzienam)"
+
+#. Label on rotate page left (anti-clockwise) item
+#: ../data/simple-scan.ui.h:69
+msgid "Rotate Left"
+msgstr "Pagriezt pa kreisi"
+
+#. Tooltip for rotate right (clockwise) button
+#: ../data/simple-scan.ui.h:71
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Pagriezt lapu pa labi (pulksteņa rādītāja virzienā)"
+
+#. Label on rotate page right (clockwise) item
+#: ../data/simple-scan.ui.h:73
+msgid "Rotate Right"
+msgstr "Pagriezt pa labi"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "Apcirst izvēlēto lapu"
+
+#: ../data/simple-scan.ui.h:75
+msgid "Crop"
+msgstr "Apcirst"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:77
+msgid "_Username for resource:"
+msgstr "Res_ursa lietotājvārds:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:79
+msgid "_Password:"
+msgstr "_Parole:"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:81
+msgid "_Authorize"
+msgstr "_Autorizēties"
+
+#. Title of preferences dialog
+#: ../data/simple-scan.ui.h:83
+msgid "Preferences"
+msgstr "Iestatījumi"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:85
+msgid "Scan S_ource:"
+msgstr "Skenēšanas av_ots:"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:87
+msgid "_Text Resolution:"
+msgstr "_Teksta izšķirtspēja:"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:89
+msgid "_Photo Resolution:"
+msgstr "Fotogrāfijas izšķirts_pēja:"
+
+#. Label beside scan side combo box
+#: ../data/simple-scan.ui.h:91
+msgid "Scan Side:"
+msgstr "Skenējamā puse:"
+
+#. Label beside page size combo box
+#: ../data/simple-scan.ui.h:93
+msgid "Page Size:"
+msgstr "Lapas izmērs:"
+
+#. Label beside brightness scale
+#: ../data/simple-scan.ui.h:95
+msgid "Brightness:"
+msgstr ""
+
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr ""
+
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr ""
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "Priekšpuse un aizmugure"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "Priekšpuse"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "Aizmugure"
+
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "Skenēt dokumentus"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "Loga platums pikseļos"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "Loga augstums pikseļos"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "PATIESS, ja lietotnes logs ir maksimizēts"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "Ierīce, no kuras skenēt"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+msgid "SANE device to acquire images from."
+msgstr "SANE ierīce, no kuras iegūt attēlus."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "Skenējamā dokumenta veids"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Skenējamā dokumenta veids. Šīs iestatījums nosaka skenēšanas izšķirtspēju, "
+"krāsas un pēcapstrādi."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "Skenēšanas virziens"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "Skenera virziens pāri skenējamai lapai."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "Skenētā attēla platums pikseļos"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
+msgid ""
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
+msgstr ""
+"Skenētā attēla platums pikseļos. Šī vērtība tiek atjaunināta uz pēdējās "
+"skenētās lapas."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "Skenētā attēla augstums pikseļos"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
+msgid ""
+"The height of scanned image in pixels. This value is updated to what the "
+"last scanned page was."
+msgstr ""
+"Skenētā attēla augstums pikseļos. Šī vērtība tiek atjaunināta, ņemot vērā "
+"pēdējo skenēto lapu."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "Papīra platums mm desmitdaļās"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Papīra platums mm desmitdaļās (vai 0 automātiskai papīra biezuma "
+"noteikšanai)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "Papīra garums mm desmitdaļās"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Papīra garums mm desmitdaļās (vai 0 automātiskai papīra biezuma noteikšanai)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "Pēdējā skenētā attēla izšķirtspēja"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
+msgid "The resolution in dots-per-inch of the previously scanned image."
+msgstr "Iepriekšēji skenētā attēla izšķirtspēja punktos/collā."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "Teksta skenējumu izšķirtspēja"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "Izšķirtspēja punktos/collā, skenējot tekstu."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "Fotogrāfiju skenējumu izšķirtspēja"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "Izšķirtspēja punktos/collā, skenējot fotogrāfijas."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "Skenējamā lapas puse"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "Skenējamās lapas puse."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "Direktorija, kurā saglabāt datnes"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Direktorija, kurā saglabāt datnes. Pēc noklusējuma datnes tiks glabātas "
+"dokumentu direktorijā."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr ""
+
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:814
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Skeneris nav atrasts. Lūdzu, pievienojiet skeneri."
+
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:844
+msgid "Unable to connect to scanner"
+msgstr "Neizdevās savienoties ar skeneri"
+
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1207
+msgid "Unable to start scan"
+msgstr "Neizdevās sākt skenēšanu"
+
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+msgid "Error communicating with scanner"
+msgstr "Kļūda, sazinoties ar skeneri"
+
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Rādīt laidiena versiju"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Drukāt atkļūdošanas ziņojumus"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr "Salabot PDF datnes, kas ir veidotas ar vecākām Simple Scan versijām"
+
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:297
+msgid "Failed to scan"
+msgstr "Neizdevās skenēt"
+
+#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
+#: ../src/simple-scan.vala:316
+msgid "Scanned Document"
+msgstr "Skenēts dokuments"
+
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[IERĪCE...] - skenēšanas utilītprogramma"
+
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
+#, c-format
+msgid "Run '%s --help' to see a full list of available command line options."
+msgstr ""
+"Palaidiet “%s --help”, lai redzētu pilnu pieejamo komandrindas opciju "
+"sarakstu."
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "Ieskenēts Dokuments.pdf"
+
+#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
+#: ../src/ui.vala:159
+#, c-format
+msgid "Username and password required to access '%s'"
+msgstr "Lai piekļūtu “%s”, ir vajadzīgs lietotājvārds un parole"
+
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:202
+msgid "No scanners detected"
+msgstr "Nav atrasts neviens skeneris"
+
+#. Hint to user on why there are no scanners detected
+#: ../src/ui.vala:204
+msgid "Please check your scanner is connected and powered on"
+msgstr "Lūdzu, pārbaudiet, vai skeneris ir pievienots un ieslēgts"
+
+#. Save dialog: Dialog title
+#: ../src/ui.vala:363
+msgid "Save As..."
+msgstr "Saglabāt kā..."
+
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:377
+msgid "Image Files"
+msgstr "Attēlu datnes"
+
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:383
+msgid "All Files"
+msgstr "Visas datnes"
+
+#. 
+#: ../src/ui.vala:388
+msgid "Select File _Type"
+msgstr "Norādīt datnes _tipu"
+
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF (vairāku lapu dokuments)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (saspiests)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (bez zudumiem)"
+
+#. Title of error dialog when save failed
+#: ../src/ui.vala:503
+msgid "Failed to save file"
+msgstr "Neizdevās saglabāt datni"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:526
+msgid "If you don't save, changes will be permanently lost."
+msgstr "Ja nesaglabāsiet, izmaiņas neatgriezeniski pazudīs."
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:563
+msgid "Save current document?"
+msgstr "Saglabāt šo dokumentu?"
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:565
+msgid "Discard Changes"
+msgstr "Izmest izmaiņas"
+
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "Nevar saglabāt attēlu priekšskatīšanai"
+
+#. Error message display when unable to preview image
+#: ../src/ui.vala:872
+msgid "Unable to open image preview application"
+msgstr "Neizdevās atvērt attēlu priekšskatīšanas lietotni"
+
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1119
+msgid "Unable to open help file"
+msgstr "Nevar atvērt palīdzības datni"
+
+#. The license this software is under (GPL3+)
+#: ../src/ui.vala:1130
+msgid ""
+"This program is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 3 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program.  If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+"Šī programma ir brīva programmatūra; jūs varat to izplatīt tālāk un/vai "
+"modificēt saskaņā ar GNU Vispārējās publiskās licences noteikumiem, ko "
+"publicējis Brīvas programmatūras fonds; izmantojiet Licences versiju 3 vai "
+"(pēc jūsu izvēles) jebkuru vēlāku versiju.Šī programma tiek izplatīta "
+"cerībā, ka tā būs noderīga, taču BEZ JEBKĀDĀM GARANTIJĀM; pat bez šķietamām "
+"KOMERCIĀLAS VĒRTĪBAS un PIEMĒROTĪBAS KONKRĒTIEM NOLŪKIEM garantijām. Sīkāku "
+"informāciju meklējiet GNU Vispārējā publiskajā licencē.Jums vajadzēja saņemt "
+"GNU Vispārējās publiskās licences kopiju kopā ar šo programmu; ja jūs to "
+"nesaņēmāt, skatiet <http://www.gnu.org/licenses/>."
+
+#. Title of about dialog
+#: ../src/ui.vala:1133
+msgid "About Simple Scan"
+msgstr "Par Simple Scan"
+
+#. Description of program
+#: ../src/ui.vala:1136
+msgid "Simple document scanning tool"
+msgstr "Vienkāršs dokumentu skenēšanas rīks"
+
+#: ../src/ui.vala:1145
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Pēteris Krišjānis https://launchpad.net/~pecisk-gmail\n"
+"  Rihards Pfeifle https://launchpad.net/~spr1nt3r\n"
+"  Rūdolfs Mazurs https://launchpad.net/~rudolfs-mazurs"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1156
+msgid "Save document before quitting?"
+msgstr "Pirms iziešanas saglabāt dokumentu?"
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1158
+msgid "Quit without Saving"
+msgstr "Iziet nesaglabājot"
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (noklusējuma)"
+
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1292
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d dpi (melraksts)"
+
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1295
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d dpi (augsta izšķirtspēja)"
+
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
+#, c-format
+msgid "%d dpi"
+msgstr "%d dpi"
+
+#. Title of dialog when cannot load required files
+#: ../src/ui.vala:1333
+msgid "Files missing"
+msgstr "Pietrūkst datņu"
+
+#. Description in dialog when cannot load required files
+#: ../src/ui.vala:1335
+msgid "Please check your installation"
+msgstr "Lūdzu, pārbaudiet instalāciju"
+
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1403
+msgid "Change _Scanner"
+msgstr "Mainīt _skeneri"
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1409
+msgid "Automatic"
+msgstr "Automātiski"
+
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr ""
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr ""
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr ""
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr ""
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr ""
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr ""
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "Saglabā dokumentu..."
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "Saglabā lapu %d no %d"
diff --git a/po/mhr.po b/po/mhr.po
new file mode 100644
index 0000000..c11e8a7
--- /dev/null
+++ b/po/mhr.po
@@ -0,0 +1,706 @@
+# Mari (Meadow) translation for simple-scan
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the simple-scan package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: simple-scan\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-04-17 06:12+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"Language-Team: Mari (Meadow) <mhr@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: 2013-09-13 05:47+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
+
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Simple Scan"
+
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: ../data/simple-scan.ui.h:4
+msgid "_Document"
+msgstr "_Документ"
+
+#. Scan menu item
+#: ../data/simple-scan.ui.h:6
+msgid "Sc_an"
+msgstr ""
+
+#. Toolbar scan menu item to scan a single page from the scanner
+#: ../data/simple-scan.ui.h:8
+msgid "Single _Page"
+msgstr "Ик _лаштык"
+
+#. Toolbar scan menu item to scan all pages from a document feeder
+#: ../data/simple-scan.ui.h:10
+msgid "All Pages From _Feeder"
+msgstr ""
+
+#. Menu entry to stop current scan
+#: ../data/simple-scan.ui.h:12
+msgid "_Stop Scan"
+msgstr ""
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:14
+msgid "Text"
+msgstr "Текст"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:16
+msgid "Photo"
+msgstr "Фотосӱрет"
+
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr ""
+
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr "_Лаштык"
+
+#. Menu item to rotate page to left (anti-clockwise)
+#: ../data/simple-scan.ui.h:22
+msgid "Rotate _Left"
+msgstr ""
+
+#. Menu item to rotate page to right (clockwise)
+#: ../data/simple-scan.ui.h:24
+msgid "Rotate _Right"
+msgstr ""
+
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr ""
+
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr ""
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "US _Letter"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "US Le_gal"
+
+#. Radio button for cropping page to 4x6 inch
+#: ../data/simple-scan.ui.h:40
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
+
+#. Radio button for cropping to custom page size
+#: ../data/simple-scan.ui.h:42
+msgid "_Custom"
+msgstr ""
+
+#. Menu item to rotate the crop area
+#: ../data/simple-scan.ui.h:44
+msgid "_Rotate Crop"
+msgstr ""
+
+#. Menu item to move the selected page to the left
+#: ../data/simple-scan.ui.h:46
+msgid "Move Left"
+msgstr "Шола"
+
+#. Menu item to move the selected page to the right
+#: ../data/simple-scan.ui.h:48
+msgid "Move Right"
+msgstr "Пурла"
+
+#. Label on help menu
+#: ../data/simple-scan.ui.h:50
+msgid "_Help"
+msgstr "_Полышык"
+
+#. Help|Contents menu
+#: ../data/simple-scan.ui.h:52
+msgid "_Contents"
+msgstr ""
+
+#. Tooltip for new document button
+#: ../data/simple-scan.ui.h:54
+msgid "Start a new document"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "У"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr ""
+
+#. Label on scan toolbar item
+#: ../data/simple-scan.ui.h:59
+msgid "Scan"
+msgstr ""
+
+#. Tooltip for save toolbar button
+#: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "Аныклаш"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
+msgid "Stop the current scan"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:65
+msgid "Stop"
+msgstr "Шогалташ"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: ../data/simple-scan.ui.h:67
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr ""
+
+#. Label on rotate page left (anti-clockwise) item
+#: ../data/simple-scan.ui.h:69
+msgid "Rotate Left"
+msgstr ""
+
+#. Tooltip for rotate right (clockwise) button
+#: ../data/simple-scan.ui.h:71
+msgid "Rotate the page to the right (clockwise)"
+msgstr ""
+
+#. Label on rotate page right (clockwise) item
+#: ../data/simple-scan.ui.h:73
+msgid "Rotate Right"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:75
+msgid "Crop"
+msgstr ""
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:77
+msgid "_Username for resource:"
+msgstr ""
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:79
+msgid "_Password:"
+msgstr "_Шолыпмут:"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:81
+msgid "_Authorize"
+msgstr ""
+
+#. Title of preferences dialog
+#: ../data/simple-scan.ui.h:83
+msgid "Preferences"
+msgstr "Келыштарымаш-влак"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:85
+msgid "Scan S_ource:"
+msgstr ""
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:87
+msgid "_Text Resolution:"
+msgstr ""
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:89
+msgid "_Photo Resolution:"
+msgstr ""
+
+#. Label beside scan side combo box
+#: ../data/simple-scan.ui.h:91
+msgid "Scan Side:"
+msgstr ""
+
+#. Label beside page size combo box
+#: ../data/simple-scan.ui.h:93
+msgid "Page Size:"
+msgstr "Лаштыкын кугыт"
+
+#. Label beside brightness scale
+#: ../data/simple-scan.ui.h:95
+msgid "Brightness:"
+msgstr ""
+
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr ""
+
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr ""
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr ""
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "Шрифт"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+msgid "SANE device to acquire images from."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
+msgid ""
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
+msgid ""
+"The height of scanned image in pixels. This value is updated to what the "
+"last scanned page was."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
+msgid "The resolution in dots-per-inch of the previously scanned image."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr ""
+
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:814
+msgid "No scanners available.  Please connect a scanner."
+msgstr ""
+
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:844
+msgid "Unable to connect to scanner"
+msgstr ""
+
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1207
+msgid "Unable to start scan"
+msgstr ""
+
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+msgid "Error communicating with scanner"
+msgstr ""
+
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr ""
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr ""
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:297
+msgid "Failed to scan"
+msgstr ""
+
+#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
+#: ../src/simple-scan.vala:316
+msgid "Scanned Document"
+msgstr ""
+
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr ""
+
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
+#, c-format
+msgid "Run '%s --help' to see a full list of available command line options."
+msgstr ""
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr ""
+
+#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
+#: ../src/ui.vala:159
+#, c-format
+msgid "Username and password required to access '%s'"
+msgstr ""
+
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:202
+msgid "No scanners detected"
+msgstr ""
+
+#. Hint to user on why there are no scanners detected
+#: ../src/ui.vala:204
+msgid "Please check your scanner is connected and powered on"
+msgstr ""
+
+#. Save dialog: Dialog title
+#: ../src/ui.vala:363
+msgid "Save As..."
+msgstr ""
+
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:377
+msgid "Image Files"
+msgstr ""
+
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:383
+msgid "All Files"
+msgstr ""
+
+#. 
+#: ../src/ui.vala:388
+msgid "Select File _Type"
+msgstr ""
+
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr ""
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr ""
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr ""
+
+#. Title of error dialog when save failed
+#: ../src/ui.vala:503
+msgid "Failed to save file"
+msgstr ""
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:526
+msgid "If you don't save, changes will be permanently lost."
+msgstr ""
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:563
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:565
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.vala:872
+msgid "Unable to open image preview application"
+msgstr ""
+
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1119
+msgid "Unable to open help file"
+msgstr ""
+
+#. The license this software is under (GPL3+)
+#: ../src/ui.vala:1130
+msgid ""
+"This program is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 3 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program.  If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+
+#. Title of about dialog
+#: ../src/ui.vala:1133
+msgid "About Simple Scan"
+msgstr ""
+
+#. Description of program
+#: ../src/ui.vala:1136
+msgid "Simple document scanning tool"
+msgstr ""
+
+#: ../src/ui.vala:1145
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Max Romanov https://launchpad.net/~dr-max-romanov"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1156
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1158
+msgid "Quit without Saving"
+msgstr ""
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr ""
+
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1292
+#, c-format
+msgid "%d dpi (draft)"
+msgstr ""
+
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1295
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr ""
+
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
+#, c-format
+msgid "%d dpi"
+msgstr ""
+
+#. Title of dialog when cannot load required files
+#: ../src/ui.vala:1333
+msgid "Files missing"
+msgstr ""
+
+#. Description in dialog when cannot load required files
+#: ../src/ui.vala:1335
+msgid "Please check your installation"
+msgstr ""
+
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1403
+msgid "Change _Scanner"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1409
+msgid "Automatic"
+msgstr ""
+
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr ""
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr ""
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr ""
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr ""
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr ""
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr ""
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr ""
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr ""
diff --git a/po/ms.po b/po/ms.po
index 90f889c..192201c 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,537 +7,594 @@ msgid ""
 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-01-26 22:27+0000\n"
-"Last-Translator: Launchpad Translations Administrators "
-"<rosetta@launchpad.net>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-07-23 09:04+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Malay <ms@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-10-22 04:47+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:45+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Pengimbas Ringkas"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr "A_4"
+msgid "_Document"
+msgstr "_Dokumen"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr "I_mbas"
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "_Halaman Tunggal"
 
 #. 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 "Semua Halaman Dari _Suapan"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr ""
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
-msgstr ""
+msgid "_Stop Scan"
+msgstr "_Henti Imbas"
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr ""
+msgid "Text"
+msgstr "Teks"
 
-#. Combo box label for scanning the front side of a page
+#. Combo box label for photo scan mode
 #: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr ""
+msgid "Photo"
+msgstr "Foto"
 
-#. Combo box label for scanning both sides of a page
+#. Label on email menu item
 #: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr ""
+msgid "_Email"
+msgstr "_Emel"
 
-#. Radio button for cropping to page to US legal size
+#. Page menu (contains action for each page, e.g. delete, crop)
 #: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr ""
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr ""
+msgid "_Page"
+msgstr "_Halaman"
 
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr ""
+#. Menu item to rotate page to left (anti-clockwise)
+#: ../data/simple-scan.ui.h:22
+msgid "Rotate _Left"
+msgstr "Putar Ke Ki_ri"
 
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
-msgid "Photo"
-msgstr "Foto"
+#. Menu item to rotate page to right (clockwise)
+#: ../data/simple-scan.ui.h:24
+msgid "Rotate _Right"
+msgstr "Putar Ke Ka_nan"
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr "Ketetapan"
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "_Crop"
 
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
-msgstr ""
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "_Tiada"
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr ""
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
 
-#. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
-msgid "Rotate _Left"
-msgstr ""
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
 
-#. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
-msgid "Rotate _Right"
-msgstr ""
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr ""
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "_Letter"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr ""
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "Le_gal"
 
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr ""
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr ""
+msgid "_Custom"
+msgstr "_Tersendiri"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr ""
+msgid "_Rotate Crop"
+msgstr "_Putar & Kerat"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
-msgstr ""
+msgid "Move Left"
+msgstr "Alih Ke Kiri"
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr ""
+msgid "Move Right"
+msgstr "ALih Ke Kanan"
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr ""
+msgid "_Help"
+msgstr "_Bantuan"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
-msgstr ""
-
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr "Pengimbas Ringkas"
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr ""
+msgid "_Contents"
+msgstr "_Kandungan"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
-msgstr ""
+msgstr "Mulakan dokumen baru"
+
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "Baru"
 
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "Imbas halaman tunggal dari pengimbas"
+
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
-msgstr ""
+msgid "Scan"
+msgstr "Imbas"
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
-msgid "Stop the current scan"
-msgstr ""
+msgid "Save document to a file"
+msgstr "Simpan dokumen ke fail"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr "Teks"
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "Simpan"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
+msgid "Stop the current scan"
+msgstr "Hentikan Imbasan semasa"
 
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr ""
+msgid "Stop"
+msgstr "Henti"
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
-msgstr ""
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Putar halaman ke kiri (lawan-jam)"
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr "_Crop"
+msgid "Rotate Left"
+msgstr "Putar Ke Kiri"
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr "_Tersendiri"
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Putar halaman ke kanan (arah-jam)"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr "_Dokumen"
+msgid "Rotate Right"
+msgstr "Putar Ke Kanan"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "Kerat halaman pilihan"
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
-msgstr ""
+msgid "Crop"
+msgstr "Kerat"
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr "_Bantuan"
+msgid "_Username for resource:"
+msgstr "_Nama pengguna untuk sumber:"
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr "_Letter"
+msgid "_Password:"
+msgstr "_Katalaluan:"
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr "_Tiada"
+msgid "_Authorize"
+msgstr "_Benarkan"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr "_Halaman"
+msgid "Preferences"
+msgstr "Keutamaan"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr "_Katalaluan:"
+msgid "Scan S_ource:"
+msgstr "Imbas Su_mber:"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
-msgstr ""
+msgid "_Text Resolution:"
+msgstr "Resolusi _Teks:"
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr ""
+msgid "_Photo Resolution:"
+msgstr "Resolusi _Foto:"
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
-msgstr ""
+msgid "Scan Side:"
+msgstr "Imbas Sisi:"
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
-msgstr ""
+msgid "Page Size:"
+msgstr "Saiz Halaman:"
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
-msgstr ""
+msgid "Brightness:"
+msgstr "Kecerahan:"
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
-msgstr ""
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr "Beza Jelas:"
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
-msgstr ""
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr "Kualiti:"
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
-msgstr ""
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "Hadapan dan Belakang"
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
-msgstr ""
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "Hadapan"
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
-msgstr ""
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "Ke belakang"
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr ""
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "Imbas Dokumen"
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "Lebar tetingkap dalam piksel"
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "Tinggi tetingkap dalam piksel"
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "BENAR jika tetingkap aplikasi dimaksimakan"
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "Peranti untuk diimbas dari"
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
-msgstr ""
+msgstr "Peranti SANE untuk memperoleh imej dari."
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "Jenis dokumen yang diimbas"
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
+"Jenis dokumen yang akan diimbas. Tetapan ini menentukan resolusi, warna dan "
+"post-pemproses imbasan."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "Arah imbasan"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "Arah pengimbas merentasi halaman terimbas."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "Lebar imej terimbas dalam piksel"
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
 msgstr ""
+"Lebar imej yang diimbas dalam piksel. Nilai ini dikemaskini berdasarkan "
+"halaman yang terakhir diimbas."
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "Tinggi imej terimbas dalam piksel"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
 msgstr ""
+"Tinggi imej yang diimbas dalam piksel. Nilai ini dikemaskini merujuk pada "
+"halaman yang terakhir diimbas."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "Lebar kertas dalam persepuluh mm"
 
-#: ../data/simple-scan.schemas.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
+"Lebar kertas dalam persepuluh mm (atau 0 untuk pengesanan kertas secara "
+"automatik)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "Tinggi ketar dalam persepuluh mm"
 
-#: ../data/simple-scan.schemas.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
 msgstr ""
+"Tinggi kertas dalam persepuluh mm (atau 0 untuk pengesanan kertas secara "
+"automatik)."
 
-#: ../data/simple-scan.schemas.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr "Kecerahan imbasan"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Pelarasan kecerahan dari -100 hingga 100 (0 tiada perubahan)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr "Beza jelas imbasan"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Pelarasan beza jelas dari -100 hingga 100 (0 tiada perubahan)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "Resolusi imej terakhir yang diimbas"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
 msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr ""
+msgstr "Resolusi dalam titik-se-inci imej yang terdahulu diimbas."
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "Resolusi untuk imbasan teks"
 
-#: ../data/simple-scan.schemas.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
 msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr ""
+msgstr "Resolusi dalam titik-se-inci yang digunakan semasa mengimbas teks."
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "Resolusi untuk imbasan foto"
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "Resolusi dalam titik-se-inci yang digunakan semasa mengimbas foto."
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "Sisi halaman untuk diimbaskan"
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "Sisi halaman untuk diimbas."
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "Direktori untuk menyimpan fail ke"
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
+"Direktori untuk menyimpan fail. Nilai lalai direktori dokumen jika tidak "
+"ditetapkan."
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr "Nilai kualiti yang digunakan untuk pemampatan JPEG"
 
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr "Nilai kualiti yang digunakan untuk pemampatan JPEG."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
-msgstr ""
+msgstr "Tiada pengimbas hadir. Sila sambungkan pengimbas."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
-msgstr ""
+msgstr "Tidak boleh menyambung kepada pengimbas"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
-msgstr ""
+msgstr "Tidak boleh memulakan imbasan"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
-msgstr ""
+msgstr "Ralat berkomunikasi dengan pengimbas"
+
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Papar versi keluaran"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Papar mesej penyahpepijatan"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr "Baiki fail PDF yang dijana dengan versi lama Simple Scan"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
-msgstr ""
+msgstr "Gagal mengimbas"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
-msgstr ""
+msgstr "Dokumen Terimbas"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
-msgstr ""
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[DEVICE...] - Utiliti mengimbas"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
+msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
+"Jalankan '%s --help' untuk melihat senarai penuh pilihan baris perintah yang "
+"ada."
 
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
-#, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
-msgstr ""
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "Dokumen Diimbas.pdf"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
-msgstr ""
+msgstr "Nama pengguna dan kata laluan diperlukan untuk mencapai '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
-msgstr ""
+msgstr "Tiada pengimbas dikesan"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
-msgstr ""
-
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr ""
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr ""
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr ""
+msgstr "Sila semak pengimbas anda sama ada ia bersambung dan dihidupkan"
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
 msgstr "Simpan Sebagai..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
-msgstr ""
+msgstr "Fail Imej"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
-msgstr ""
+msgstr "Semua Fail"
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
-msgstr ""
+msgstr "Pilih Jenis _Fail"
+
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF (dokumen berbilang-halaman)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (termampat)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (tidak hilang)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
-msgstr ""
+msgstr "Gagal menyimpan fail"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
-msgstr ""
+msgstr "Jika anda tidak simpan, semua perubahan akan hilang."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
-msgstr ""
+msgstr "Simpan dokumen semasa"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
-msgstr ""
+msgstr "Abai Perubahan"
+
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "Tidak boleh menyimpan imej untuk pratonton"
 
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
-msgstr ""
+msgstr "Tidak boleh membuka aplikasi partonton imej"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
-msgstr ""
+msgstr "Tidak boleh membuka fail bantuan"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -552,77 +609,193 @@ msgid ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
+"Perisian ini adalah perisian bebas; anda boleh mengedarkannya dan/atau "
+"mengubahsuainya dibawah terma Pelesenan Awam Am GNU yang diterbitkan oleh "
+"Free Software Foundation, versi 3.\\n\n"
+"\n"
+"Perisian ini diedarkan dengan harapan ianya akan berguna, TANPA SEBARANG "
+"JAMINAN; termasuk juga KESESUAIAN UNTUK DIPASARKAN, JAMINAN KUALITI, atau "
+"JAMINAN ATAS APA JUA SEBAB. Sila lihat GNU General Public License untuk "
+"maklumat lanjut.\n"
+"\n"
+"Anda seharusnya menerima satu salinan Lesen Awam Am GNU bersama-sama dengan "
+"pengurus skrip Nautilus; jika tidak, laporkannya ke Free Software "
+"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
 msgstr "Mengenai Pengimbas Ringkas"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
-msgstr ""
+msgstr "Alat mengimbas dokumen mudah"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Khairul Aizat Kamarudzzaman https://launchpad.net/~fenris"
+"  CL TAN https://launchpad.net/~tcl111985\n"
+"  Khairul Aizat Kamarudzzaman https://launchpad.net/~fenris\n"
+"  Launchpad Translations Administrators https://launchpad.net/~rosetta\n"
+"  abuyop https://launchpad.net/~abuyop\n"
+"  ahmad akmal bin mohd idris https://launchpad.net/~mamahopsk87"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
-msgstr ""
+msgstr "Simpan dokumen sebelum keluar?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
-msgstr ""
+msgstr "Keluar tanpa Menyimpan"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
 #, c-format
-msgid "%d dpi (draft)"
-msgstr ""
+msgid "%d dpi (default)"
+msgstr "%d dpi (tersedia)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1292
 #, c-format
-msgid "%d dpi"
-msgstr ""
+msgid "%d dpi (draft)"
+msgstr "%d dpi (draf)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
-msgstr ""
+msgstr "%d dpi (resolusi tinggi)"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
-msgstr ""
+msgid "%d dpi"
+msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
-msgstr ""
+msgstr "Fail hilang"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
-msgstr ""
+msgstr "Sila semak pemasangan anda"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
-msgstr ""
+msgstr "Ubah _Pengimbas"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
-msgstr ""
+msgstr "Automatik"
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
-msgstr ""
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr "Lebih Gelap"
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr "Lebih Cerah"
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr "Kurang"
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr "Lagi"
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr "Minimum"
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr "Maksimum"
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "Menyimpan dokumen..."
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "Menyimpan halaman %d daripada %d"
+
+#~ msgid ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ msgstr ""
+#~ "Arah pengimbas menerusi halaman yang diimbas. Ia boleh jadi salah satu yang "
+#~ "berikut: 'atas-ke-bawah' 'bawah-ke-atas' 'kiri-ke-kanan' 'kanan-ke-kiri'"
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "Penggunaan:\n"
+#~ "  %s [DEVICE...] - Utiliti pengimbasan"
+
+#~ msgid ""
+#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ msgstr ""
+#~ "Sisi halaman untuk diimbaskan. ia boleh salah satu seperti berikut: 'kedua-"
+#~ "dua' 'hadapan' 'belakang'"
+
+#, c-format
+#~ msgid ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+#~ msgstr ""
+#~ "Pilihan Bantuan:\n"
+#~ "  -d, --debug Papar mesej penyahpepijat\n"
+#~ "  -v, --version Papar versi pelepasan\n"
+#~ "  -h, --help Papar pilihan bantuan\n"
+#~ "  --help-all Papar semua pilihan bantuan\n"
+#~ "  --help-gtk Papar pilihan GTK+"
+
+#~ msgid ""
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
+#~ msgstr ""
+#~ "Jenis dokumen yang diimbaskan. 'teks' untuk dokumen teks, 'foto' untuk foto. "
+#~ "Tetapan ini menentukan resolusi, warna dan pra-pemprosesan imbasan."
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "Pilihan GTK+:\n"
+#~ "  --class=CLASS Kelas program yang digunakan oleh pengurus tetingkap\n"
+#~ "  --name=NAME Nama program yang digunakan oleh pengurus tetingkap\n"
+#~ "  --screen=SCREEN Skrin X yang digunakan\n"
+#~ "  --sync Lakukan penyegerakan panggilan X\n"
+#~ "  --gtk-module=MODULES Muat modul GTK+ tambahan\n"
+#~ "  --g-fatal-warnings Jadikan semua amaran mati"
diff --git a/po/my.po b/po/my.po
new file mode 100644
index 0000000..d8b261b
--- /dev/null
+++ b/po/my.po
@@ -0,0 +1,732 @@
+# Burmese translation for simple-scan
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the simple-scan package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: simple-scan\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-04-17 06:12+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"Language-Team: Burmese <my@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: 2013-09-13 05:44+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
+
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "ရိုးရိုး Scan ဖတ်ခြင်း"
+
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: ../data/simple-scan.ui.h:4
+msgid "_Document"
+msgstr "_Dစာရွက်စာတမ်း"
+
+#. Scan menu item
+#: ../data/simple-scan.ui.h:6
+msgid "Sc_an"
+msgstr "Sc_an"
+
+#. Toolbar scan menu item to scan a single page from the scanner
+#: ../data/simple-scan.ui.h:8
+msgid "Single _Page"
+msgstr "_P ရိုးရိုး Scan ဖတ်ခြင်း"
+
+#. Toolbar scan menu item to scan all pages from a document feeder
+#: ../data/simple-scan.ui.h:10
+msgid "All Pages From _Feeder"
+msgstr "_F Feeder မှ စာမျက်နှာအားလုံး"
+
+#. Menu entry to stop current scan
+#: ../data/simple-scan.ui.h:12
+msgid "_Stop Scan"
+msgstr "_S Scan ရပ်မည်။"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:14
+msgid "Text"
+msgstr "စာ"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:16
+msgid "Photo"
+msgstr "ဓာတ်ပုံ"
+
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr "_Eအီးမေး"
+
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr "_Pစာမျက်နှာ"
+
+#. Menu item to rotate page to left (anti-clockwise)
+#: ../data/simple-scan.ui.h:22
+msgid "Rotate _Left"
+msgstr "_L ဘယ်ဖက်လှည့်ပါ။"
+
+#. Menu item to rotate page to right (clockwise)
+#: ../data/simple-scan.ui.h:24
+msgid "Rotate _Right"
+msgstr "_R ညာဖက်သို့လှည့်မည်။"
+
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "_C ဖြတ်ပါ။"
+
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "_Nဘာမှမဟုတ်"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "_L စာ"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "Le_gal"
+
+#. Radio button for cropping page to 4x6 inch
+#: ../data/simple-scan.ui.h:40
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
+
+#. Radio button for cropping to custom page size
+#: ../data/simple-scan.ui.h:42
+msgid "_Custom"
+msgstr "_Custom"
+
+#. Menu item to rotate the crop area
+#: ../data/simple-scan.ui.h:44
+msgid "_Rotate Crop"
+msgstr "_Rotate Crop"
+
+#. Menu item to move the selected page to the left
+#: ../data/simple-scan.ui.h:46
+msgid "Move Left"
+msgstr "ဘယ်ဖက်သို့ရွှေ့ပါ။"
+
+#. Menu item to move the selected page to the right
+#: ../data/simple-scan.ui.h:48
+msgid "Move Right"
+msgstr "ညာဖက်သို့ရွှေ့ပါ။"
+
+#. Label on help menu
+#: ../data/simple-scan.ui.h:50
+msgid "_Help"
+msgstr "_H အကူအညီ"
+
+#. Help|Contents menu
+#: ../data/simple-scan.ui.h:52
+msgid "_Contents"
+msgstr "_  C ခေါင်းစဉ်"
+
+#. Tooltip for new document button
+#: ../data/simple-scan.ui.h:54
+msgid "Start a new document"
+msgstr "အသစ်စတင်ရန်"
+
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "အသစ်"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "Scanner ထဲမှ စာမျက်နှာ တစ်ရွက်တည်းကို Scan ဖတ်မည်။"
+
+#. Label on scan toolbar item
+#: ../data/simple-scan.ui.h:59
+msgid "Scan"
+msgstr "Scan"
+
+#. Tooltip for save toolbar button
+#: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr "ဖိုင် တစ်ခုထဲသို့ စာရွက်စာတမ်း ကိုသိမ်းပါ။"
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "သိမ်းဆည်းပါ"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
+msgid "Stop the current scan"
+msgstr "ယခု Scan ဖတ်နေခြင်းကိုရပ်မည်။"
+
+#: ../data/simple-scan.ui.h:65
+msgid "Stop"
+msgstr "ရပ်မည်"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: ../data/simple-scan.ui.h:67
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "စာမျက်နှာကို ဘယ်ဖက်သို့လှည့်ပါ။(နာရီလက်တံပြောင်းပြန်)"
+
+#. Label on rotate page left (anti-clockwise) item
+#: ../data/simple-scan.ui.h:69
+msgid "Rotate Left"
+msgstr "ဘယ်ဖက် လှည့်ပါ။"
+
+#. Tooltip for rotate right (clockwise) button
+#: ../data/simple-scan.ui.h:71
+msgid "Rotate the page to the right (clockwise)"
+msgstr "စာမျက်နှာကို ညာဖက်သို့လှည့်ပါ။ (နာရီလက်တံ)"
+
+#. Label on rotate page right (clockwise) item
+#: ../data/simple-scan.ui.h:73
+msgid "Rotate Right"
+msgstr "ညာဖက်လှည့်ပါ။"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "ရွေးချယ်ထားသောစာမျက်နှာကို ဖြတ်ပါ။"
+
+#: ../data/simple-scan.ui.h:75
+msgid "Crop"
+msgstr "ဖြတ်ပါ။"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:77
+msgid "_Username for resource:"
+msgstr "_Username for resource:"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:79
+msgid "_Password:"
+msgstr "_Pစကားဝှက်"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:81
+msgid "_Authorize"
+msgstr "_A ခွင့်ပြုခြင်း"
+
+#. Title of preferences dialog
+#: ../data/simple-scan.ui.h:83
+msgid "Preferences"
+msgstr "Preferences"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:85
+msgid "Scan S_ource:"
+msgstr "Scan S_ource:"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:87
+msgid "_Text Resolution:"
+msgstr "_Text Resolution:"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:89
+msgid "_Photo Resolution:"
+msgstr "_Pဓာတ်ပုံ resolution-"
+
+#. Label beside scan side combo box
+#: ../data/simple-scan.ui.h:91
+msgid "Scan Side:"
+msgstr "Scan Side:"
+
+#. Label beside page size combo box
+#: ../data/simple-scan.ui.h:93
+msgid "Page Size:"
+msgstr "စာရွက်အရွယ်အစား"
+
+#. Label beside brightness scale
+#: ../data/simple-scan.ui.h:95
+msgid "Brightness:"
+msgstr ""
+
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr ""
+
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr ""
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "အရှေ့နှင့်အနောက်"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "အရှေ့"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "နောက်သို့"
+
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "Scan Documents"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "Window width in pixels"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "Window height in pixels"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "TRUE if the application window is maximized"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "ဘယ်ကိရိယာမှ Scan ဖတ်မည်..."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+msgid "SANE device to acquire images from."
+msgstr "SANE device to acquire images from."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "Scan ဖတ်မည့် စာရွက်စာတမ်း အမျိုးအစား"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "Scan ၏ လားရာ"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "The direction of the scanner across the scanned page."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "Width of scanned image in pixels"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
+msgid ""
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
+msgstr ""
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "Height of scanned image in pixels"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
+msgid ""
+"The height of scanned image in pixels. This value is updated to what the "
+"last scanned page was."
+msgstr ""
+"The height of scanned image in pixels. This value is updated to what the "
+"last scanned page was."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "Width of paper in tenths of a mm"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "Height of paper in tenths of a mm"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "Resolution of last scanned image"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
+msgid "The resolution in dots-per-inch of the previously scanned image."
+msgstr "The resolution in dots-per-inch of the previously scanned image."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "Resolution for text scans"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "The resolution in dots-per-inch to use when scanning text."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "Resolution for photo scans"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "The resolution in dots-per-inch to use when scanning photos."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "Page side to scan"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "The page side to scan."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "ဖိုင်ကိုသိမ်းရန်အတွက်နေရာ"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"The directory to save files to. Defaults to the documents directory if unset."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr ""
+
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:814
+msgid "No scanners available.  Please connect a scanner."
+msgstr "Scanner နှင့်ချိတ်ဆက်ထားခြင်းမရှိပါ။ Scanner နှင့်ချိတ်ဆက်ပါ။"
+
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:844
+msgid "Unable to connect to scanner"
+msgstr "Scanner နှင့်မချိတ်ဆက်နိုင်ပါ။"
+
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1207
+msgid "Unable to start scan"
+msgstr "Scan မစတင်နိုင်ပါ။"
+
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+msgid "Error communicating with scanner"
+msgstr "Scanner နှင့်ချိတ်ဆက်ရင်းအမှားအယွင်းဖြစ်ခဲ့သည်။"
+
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "ထုတ်လုပ်သော ဗားရှင်းကို ပြပါ"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Debugging messages ကိုစာရွက်ထုတ်မည်။"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr "Fix PDF files generated with older versions of Simple Scan"
+
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:297
+msgid "Failed to scan"
+msgstr "Scan မဖတ်ဖြစ်ပါ။"
+
+#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
+#: ../src/simple-scan.vala:316
+msgid "Scanned Document"
+msgstr "Scan ဖတ်ပြီးသော စာရွက်စာတမ်း"
+
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[DEVICE...] - Scanning utility"
+
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
+#, c-format
+msgid "Run '%s --help' to see a full list of available command line options."
+msgstr "အမိန့်ပေး စာရင်း အပြည့်အစုံမြင်ရရန်  '%s--help' ဖြင့် ခိုင်းပါ"
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "Scanned Document.pdf"
+
+#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
+#: ../src/ui.vala:159
+#, c-format
+msgid "Username and password required to access '%s'"
+msgstr "'%s' ကိုသုံးရန်အတွက်သုံးစွဲသူအမည်နှင့် စကားဝှက်လိုအပ်ပါသည်။"
+
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:202
+msgid "No scanners detected"
+msgstr "Scanner ရှာမတွေ့ပါ။"
+
+#. Hint to user on why there are no scanners detected
+#: ../src/ui.vala:204
+msgid "Please check your scanner is connected and powered on"
+msgstr ""
+"သင်၏ Scanner ကိုချိတ်ဆက်ပြီးကြောင်း၊ "
+"ပါဝါဖွင့်ထားကြောင်းသေချာအောင်ပြန်လည်စစ်ဆေးပါ။"
+
+#. Save dialog: Dialog title
+#: ../src/ui.vala:363
+msgid "Save As..."
+msgstr "Save As..."
+
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:377
+msgid "Image Files"
+msgstr "Image Files"
+
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:383
+msgid "All Files"
+msgstr "ဖိုင်အလုံးစုံ"
+
+#. 
+#: ../src/ui.vala:388
+msgid "Select File _Type"
+msgstr "_T ဖိုင်အမျိုးအစားရွေးပါ။"
+
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF (multi-page document)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (compressed)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (lossless)"
+
+#. Title of error dialog when save failed
+#: ../src/ui.vala:503
+msgid "Failed to save file"
+msgstr "ဖိုင်ကိုမသိမ်းဖြစ်ပါ။"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:526
+msgid "If you don't save, changes will be permanently lost."
+msgstr "မသိမ်းပါက၊ ပြောင်းလဲမူများသည် လုံးဝပျက်သွားပါလိမ့်မည်။"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:563
+msgid "Save current document?"
+msgstr "ယခုစာရွက်စာတမ်းကိုသိမ်းမလား။"
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:565
+msgid "Discard Changes"
+msgstr "Discard Changes"
+
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "ကြည့်ရူရန်အတွက် ပုံများကိုမသိမ်းနိုင်ပါ။"
+
+#. Error message display when unable to preview image
+#: ../src/ui.vala:872
+msgid "Unable to open image preview application"
+msgstr "Unable to open image preview application"
+
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1119
+msgid "Unable to open help file"
+msgstr "အကူအညီဖိုင်ကို မဖွင့်နိုင်ပါ။"
+
+#. The license this software is under (GPL3+)
+#: ../src/ui.vala:1130
+msgid ""
+"This program is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 3 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program.  If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+"This program is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 3 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program.  If not, see <http://www.gnu.org/licenses/>."
+
+#. Title of about dialog
+#: ../src/ui.vala:1133
+msgid "About Simple Scan"
+msgstr "ရိုးရှင်းစွာ Scan ဖတ်ခြင်းအကြောင်း"
+
+#. Description of program
+#: ../src/ui.vala:1136
+msgid "Simple document scanning tool"
+msgstr "Simple document scanning tool"
+
+#: ../src/ui.vala:1145
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Bone Pyae Sone https://launchpad.net/~bonepyaesone\n"
+"  Pyae Sone https://launchpad.net/~gipsyhnh"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1156
+msgid "Save document before quitting?"
+msgstr "မပိတ်ခင် စာရွက်စာတမ်းများကိုသိမ်းမလား။"
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1158
+msgid "Quit without Saving"
+msgstr "မသိမ်းပဲနှင့်ထွက်မည်။"
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (default)"
+
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1292
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d dpi (draft)"
+
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1295
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d dpi (high resolution)"
+
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
+#, c-format
+msgid "%d dpi"
+msgstr "%d dpi"
+
+#. Title of dialog when cannot load required files
+#: ../src/ui.vala:1333
+msgid "Files missing"
+msgstr "ဖိုင်များပျောက်နေပါသည်။"
+
+#. Description in dialog when cannot load required files
+#: ../src/ui.vala:1335
+msgid "Please check your installation"
+msgstr "သင်၏ စက်ထဲသို့သွင်းခြင်းကို ပြန်လည်စစ်ဆေးပါ။"
+
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1403
+msgid "Change _Scanner"
+msgstr "Change _Scanner"
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1409
+msgid "Automatic"
+msgstr "အလိုအလျှောက်"
+
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr ""
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr ""
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr ""
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr ""
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr ""
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr ""
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr ""
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr ""
diff --git a/po/nb.po b/po/nb.po
index 874e829..4eeace6 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,565 +7,591 @@ msgid ""
 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-08-05 22:50+0000\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-07-23 09:04+0000\n"
 "Last-Translator: Kjetil Birkeland Moe <kjetil@skifremme.com>\n"
 "Language-Team: Norwegian Bokmal <nb@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-10-22 04:47+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:45+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Simple Scan"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr "A_4"
+msgid "_Document"
+msgstr "_Dokument"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr "Sk_ann"
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "Enkel _side"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:10
 msgid "All Pages From _Feeder"
 msgstr "Alle sider fra papirmater"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr "Bakside"
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
-msgstr "Beskjær"
+msgid "_Stop Scan"
+msgstr "_Stopp skanning"
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr "Beskjær valgt side"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr "Forside"
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr "For- og bakside"
-
-#. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr "US Le_gal"
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr "Ny"
-
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr "Sidestørrelse:"
+msgid "Text"
+msgstr "Tekst"
 
 #. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
+#: ../data/simple-scan.ui.h:16
 msgid "Photo"
 msgstr "Bilde"
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr "Brukervalg"
-
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
-msgstr "Roter mot venstre"
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr "_E-post"
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr "Roter mot høyre"
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr "_Side"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
+#: ../data/simple-scan.ui.h:22
 msgid "Rotate _Left"
 msgstr "Roter mot _venstre"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
+#: ../data/simple-scan.ui.h:24
 msgid "Rotate _Right"
 msgstr "Roter mot _høyre"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Roter siden til venstre (mot urviseren)"
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "_Beskjær"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Roter siden til høyre (med urviseren)"
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "_Ingen"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
 
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "US _Letter"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "US Le_gal"
+
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr "Lagre"
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr "Lagre dokument til fil"
+msgid "_Custom"
+msgstr "E_gendefinert"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr "Sk_ann"
+msgid "_Rotate Crop"
+msgstr "_Roter beskjæringsområdet"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
-msgstr "Skann"
+msgid "Move Left"
+msgstr ""
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr "Hent fra:"
+msgid "Move Right"
+msgstr ""
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr "Skann side:"
+msgid "_Help"
+msgstr "_Hjelp"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
-msgstr "Skann én enkel side fra skanneren"
-
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr "Simple Scan"
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr "Enkel _side"
+msgid "_Contents"
+msgstr "_Innhold"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
 msgstr "Begynn et nytt dokument"
 
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "Ny"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "Skann én enkel side fra skanneren"
+
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
-msgstr "Stopp"
+msgid "Scan"
+msgstr "Skann"
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr "Lagre dokument til fil"
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "Lagre"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
 msgid "Stop the current scan"
 msgstr "Stopp skanning"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr "Tekst"
-
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr "_Autoriser"
+msgid "Stop"
+msgstr "Stopp"
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
-msgstr "_Innhold"
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Roter siden til venstre (mot urviseren)"
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr "_Beskjær"
+msgid "Rotate Left"
+msgstr "Roter mot venstre"
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr "E_gendefinert"
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Roter siden til høyre (med urviseren)"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr "_Dokument"
+msgid "Rotate Right"
+msgstr "Roter mot høyre"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "Beskjær valgt side"
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
-msgstr "_E-post"
+msgid "Crop"
+msgstr "Beskjær"
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr "_Hjelp"
+msgid "_Username for resource:"
+msgstr "_Brukernavn for ressurs:"
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr "US _Letter"
+msgid "_Password:"
+msgstr "_Passord:"
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr "_Ingen"
+msgid "_Authorize"
+msgstr "_Autoriser"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr "_Side"
+msgid "Preferences"
+msgstr "Innstillinger"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr "_Passord:"
+msgid "Scan S_ource:"
+msgstr "Hent fra:"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
-msgstr "_Bildeoppløsning:"
+msgid "_Text Resolution:"
+msgstr "_Tekstoppløsning"
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr "_Roter beskjæringsområdet"
+msgid "_Photo Resolution:"
+msgstr "_Bildeoppløsning:"
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
-msgstr "_Stopp skanning"
+msgid "Scan Side:"
+msgstr "Skann side:"
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
-msgstr "_Tekstoppløsning"
+msgid "Page Size:"
+msgstr "Sidestørrelse:"
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
-msgstr "_Brukernavn for ressurs:"
+msgid "Brightness:"
+msgstr "Lysstyrke:"
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
-msgstr "Skann dokumenter"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr "Kontrast:"
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
-msgstr "Enhet det skal skannes fra"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr "Kvalitet:"
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
-msgstr "Skanneretning"
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "For- og bakside"
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
-msgstr "Lagre filer i mappe"
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "Forside"
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
-msgstr "Papirhøyde i tiendels millimeter"
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "Bakside"
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr "Høyde på skannede bilder, i pixler"
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "Skann dokumenter"
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
-msgstr "Side som skal skannes"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "Vindusbredde i pixler"
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
-msgstr "Oppløsning for bildeskanning"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "Vindushøyde i pixler"
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
-msgstr "Oppløsning for tekstskanning"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "SANN hvis programvinduet er maksimert"
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
-msgstr "Oppløsning på sist skannede bilde"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "Enhet det skal skannes fra"
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
 msgstr "SANE-enhet som bilder skal hentes fra."
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
-msgstr "SANN hvis programvinduet er maksimert"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "Dokumenttype som skannes"
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
-"Retning skanneren skal gjøre over siden. Den kan være en av følgende: 'topp-"
-"til-bunn' 'bunn-til-topp' 'venstre-til-høyre' 'høyre-til-venstre'"
+"Dokumenttype som skal scannes. Denne innstillingen endrer oppløsning, farger "
+"og etterbehandling."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "Skanneretning"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "Retningen til scanneren over den scannede siden."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "Bredde på skannet bilde, i pixler"
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr "Mappen filer skal lagres til. Standard er dokumentmappen."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
+msgstr ""
+"Bredden på skannede bilder, i pixler. Denne verdien settes til størrelsen "
+"fra sist skannede side."
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "Høyde på skannede bilder, i pixler"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
 msgstr ""
 "Høyden på skannet bilde, i pixler. Verdien settes til sist skannede side."
 
-#: ../data/simple-scan.schemas.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "Papirbredde i tiendels millimeter"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Papirbredden i tiendels millimeter (eller 0 for automatisk gjenkjenning)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "Papirhøyde i tiendels millimeter"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 "Papirhøyde i tiendels millimeter (eller 0 for automatisk gjenkjenning)."
 
-#: ../data/simple-scan.schemas.in.h:16
-msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr "Skanningens ysstyrke"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Justering av lysstyrke fra -100 til 100 (0 betyr ingen lys)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr "Skanningens kontrastforsterkning"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
-"Siden som skal skannes. Det kan være én av følgende: 'begge' 'forside' "
-"'bakside'"
+"Justering av kontrast fra -100 til 100 (en verdi på 0 gir ingen "
+"forsterkning)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "Oppløsning på sist skannede bilde"
 
-#: ../data/simple-scan.schemas.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
 msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr "Oppløsning i punkter-per-tomme til sist utførte skanning."
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "Oppløsning i punkter-per-tomme for skanning av bilder."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "Oppløsning for tekstskanning"
 
-#: ../data/simple-scan.schemas.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "Oppløsningen i punkter-per-tomme for skanning av tekst."
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"Bredden på skannede bilder, i pixler. Denne verdien settes til størrelsen "
-"fra sist skannede side."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "Oppløsning for bildeskanning"
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Papirbredden i tiendels millimeter (eller 0 for automatisk gjenkjenning)."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "Oppløsning i punkter-per-tomme for skanning av bilder."
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
-msgstr "Dokumenttype som skannes"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "Side som skal skannes"
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
-msgstr ""
-"Dokumenttype som skannes. 'tekst' for tekstdokumenter, 'bilde' for bilder. "
-"Denne innstillinger bestemmer oppløsning, farger og etterbehandling for "
-"skanningen."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "Siden som skal scannes."
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
-msgstr "Papirbredde i tiendels millimeter"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "Lagre filer i mappe"
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
-msgstr "Bredde på skannet bilde, i pixler"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr "Mappen filer skal lagres til. Standard er dokumentmappen."
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
-msgstr "Vindushøyde i pixler"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr "Kvalitetsverdi som skal brukes til JPEG-komprimering"
 
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
-msgstr "Vindusbredde i pixler"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr "Kvalitetsverdi som skal brukes til JPEG-komprimering"
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Ingen skanner tilgjengelig. Vennligst koble til en skanner."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
 msgstr "Klarte ikke å koble til skanneren"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
 msgstr "Klarte ikke å sette i gang skanneren"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
 msgstr "Det oppsto en kommunikasjonsfeil mellom skanneren og datamaskinen"
 
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Vis utgivelsesversjon"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Vis feilsøkingsmeldinger"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+"Reparer PDF-filer som er opprettet med eldre versjoner av Simple Scan"
+
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
 msgstr "Klarte ikke å utføre skanningen"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
 msgstr "Skannet dokument"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
-msgstr ""
-"Bruk:\n"
-"  %s [ENHET...] - Skanneutstyr"
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[ENHET...] - Scanneutstyr"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
+msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
-"Alternativer for hjelp:\n"
-"  -d, --debug                     Vis feilsøkingsinformasjon\n"
-"  -v, --version                   Vis utgivelsesinformasjon\n"
-"  -h, --help                      Vis alternativer for hjelp\n"
-"  --help-all                      Vis alle alternativer for hjelp\n"
-"  --help-gtk                      Vis alternativer for GTK+"
-
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
-#, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
-msgstr ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
+"Kjør «%s --help» for å se en full liste over tilgjengelige kommandolinjevalg."
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "Skannet_dokument.pdf"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Behøver brukernavn og passord for å få tilgang til '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
 msgstr "Fant ingen skannere"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
 msgstr "Undersøk om skanneren er riktig tilkoblet, og at den er slått på"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr "PDF (flersidig dokument)"
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr "JPEG (komprimert)"
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr "PNG (tapsfri)"
-
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
 msgstr "Lagre som..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
 msgstr "Bildefiler"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
 msgstr "Alle Filer"
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
 msgstr "Velg fil_type"
 
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF (flersidig dokument)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (komprimert)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (tapsfri)"
+
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
 msgstr "Lagring av fil mislyktes"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Hvis du ikke lagrer vil endringene gå tapt."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
 msgstr "Lagre gjeldende dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
 msgstr "Forkast endringer"
 
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "Kunne ikke lagre forhåndsvisning"
+
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
 msgstr "Åpning av forhåndsvisning mislyktes"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
 msgstr "Kan ikke åpne hjelpfil"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -594,16 +620,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
 msgstr "Om Simple Scan"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
 msgstr "Enkelt verktøy for å skanne dokumenter"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -611,62 +637,166 @@ msgstr ""
 "  Kenneth Salvesen https://launchpad.net/~kesalves\n"
 "  Kjetil Birkeland Moe https://launchpad.net/~kjetilbmoe\n"
 "  Kåre Birger Lapstuen https://launchpad.net/~lapstue\n"
-"  Mats Taraldsvik https://launchpad.net/~meastp"
+"  Mats Taraldsvik https://launchpad.net/~meastp\n"
+"  Åka Sikrom https://launchpad.net/~akrosikam"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
 msgstr "Lagre dokumentet før du avslutter?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
 msgstr "Avslutt uten å lagre"
 
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (standard)"
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#: ../src/ui.vala:1292
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (kladd)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
-#, c-format
-msgid "%d dpi"
-msgstr "%d dpi"
-
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (høy oppløsning)"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
-msgstr "%d dpi (standard)"
+msgid "%d dpi"
+msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
 msgstr "Manglende filer"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
 msgstr "Vennligst undersøk installasjonen"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
 msgstr "Bytt _skanner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
-msgstr "Skannet_dokument.pdf"
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr "Mørkere"
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr "Lysere"
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr "Mindre"
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr "Mer"
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr "Minimum"
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr "Maksimum"
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "Lagrer dokument …"
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "Lagrer side nr. %d av %d"
+
+#~ msgid ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ msgstr ""
+#~ "Retning skanneren skal gjøre over siden. Den kan være en av følgende: 'topp-"
+#~ "til-bunn' 'bunn-til-topp' 'venstre-til-høyre' 'høyre-til-venstre'"
+
+#~ msgid ""
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
+#~ msgstr ""
+#~ "Dokumenttype som skannes. 'tekst' for tekstdokumenter, 'bilde' for bilder. "
+#~ "Denne innstillinger bestemmer oppløsning, farger og etterbehandling for "
+#~ "skanningen."
+
+#, c-format
+#~ msgid ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+#~ msgstr ""
+#~ "Alternativer for hjelp:\n"
+#~ "  -d, --debug                     Vis feilsøkingsinformasjon\n"
+#~ "  -v, --version                   Vis utgivelsesinformasjon\n"
+#~ "  -h, --help                      Vis alternativer for hjelp\n"
+#~ "  --help-all                      Vis alle alternativer for hjelp\n"
+#~ "  --help-gtk                      Vis alternativer for GTK+"
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "Bruk:\n"
+#~ "  %s [ENHET...] - Skanneutstyr"
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+
+#~ msgid ""
+#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ msgstr ""
+#~ "Siden som skal skannes. Det kan være én av følgende: 'begge' 'forside' "
+#~ "'bakside'"
diff --git a/po/nl.po b/po/nl.po
index 40a72d6..ec68db7 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,326 +7,347 @@ msgid ""
 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-08-07 08:15+0000\n"
-"Last-Translator: Hannie Dumoleyn <Unknown>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-07-23 09:04+0000\n"
+"Last-Translator: Robert Ancell <robert.ancell@canonical.com>\n"
 "Language-Team: Dutch <nl@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-10-22 04:47+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:44+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Scannen"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr "A_4"
+msgid "_Document"
+msgstr "_Document"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr "Sc_annen"
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "Enkele _pagina"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:10
 msgid "All Pages From _Feeder"
 msgstr "Alle pagina's van in_voer"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr "Terug"
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
-msgstr "Bijsnijden"
+msgid "_Stop Scan"
+msgstr "Scan _stoppen"
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr "De geselecteerde pagina bijsnijden"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr "Voor"
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr "Voor- en achterzijde"
-
-#. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr "VS Le_gal"
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr "Nieuw"
-
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr "Paginagrootte:"
+msgid "Text"
+msgstr "Tekst"
 
 #. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
+#: ../data/simple-scan.ui.h:16
 msgid "Photo"
 msgstr "Foto"
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr "Voorkeuren"
-
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
-msgstr "Linksom draaien"
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr "_E-mailen"
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr "Rechtsom draaien"
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr "_Pagina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
+#: ../data/simple-scan.ui.h:22
 msgid "Rotate _Left"
 msgstr "_Linksom draaien"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
+#: ../data/simple-scan.ui.h:24
 msgid "Rotate _Right"
 msgstr "_Rechtsom draaien"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "De pagina linksom draaien (tegen de klok in)"
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "_Bijsnijden"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr "De pagina rechtsom draaien (met de klok mee)"
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "_Geen"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
 
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "VS _Letter"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "VS Le_gal"
+
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr "Opslaan"
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr "Document naar een bestand opslaan"
+msgid "_Custom"
+msgstr "_Aangepast"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr "Sc_annen"
+msgid "_Rotate Crop"
+msgstr "Bijsnijden d_raaien"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
-msgstr "Scannen"
+msgid "Move Left"
+msgstr "Naar links verplaatsen"
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr "Scanner:"
+msgid "Move Right"
+msgstr "Naar rechts verplaatsen"
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr "Scangrootte:"
+msgid "_Help"
+msgstr "_Hulp"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
-msgstr "Een enkele pagina scannen"
-
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr "Scannen"
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr "Enkele _pagina"
+msgid "_Contents"
+msgstr "_Inhoud"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
 msgstr "Een nieuw document beginnen"
 
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "Nieuw"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "Een enkele pagina scannen"
+
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
-msgstr "Stoppen"
+msgid "Scan"
+msgstr "Scannen"
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr "Document naar een bestand opslaan"
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "Opslaan"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
 msgid "Stop the current scan"
 msgstr "De huidige scan stoppen"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr "Tekst"
-
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr "Toest_aan"
+msgid "Stop"
+msgstr "Stoppen"
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
-msgstr "_Inhoud"
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "De pagina linksom draaien (tegen de klok in)"
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr "_Bijsnijden"
+msgid "Rotate Left"
+msgstr "Linksom draaien"
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr "_Aangepast"
+msgid "Rotate the page to the right (clockwise)"
+msgstr "De pagina rechtsom draaien (met de klok mee)"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr "_Document"
+msgid "Rotate Right"
+msgstr "Rechtsom draaien"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "De geselecteerde pagina bijsnijden"
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
-msgstr "_E-mailen"
+msgid "Crop"
+msgstr "Bijsnijden"
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr "_Hulp"
+msgid "_Username for resource:"
+msgstr "Gebr_uikersnaam voor bron:"
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr "VS _Letter"
+msgid "_Password:"
+msgstr "_Wachtwoord:"
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr "_Geen"
+msgid "_Authorize"
+msgstr "Toest_aan"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr "_Pagina"
+msgid "Preferences"
+msgstr "Voorkeuren"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr "_Wachtwoord:"
+msgid "Scan S_ource:"
+msgstr "Scanner:"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
-msgstr "_Fotoresolutie:"
+msgid "_Text Resolution:"
+msgstr "_Tekstresolutie:"
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr "Bijsnijden d_raaien"
+msgid "_Photo Resolution:"
+msgstr "_Fotoresolutie:"
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
-msgstr "Scan _stoppen"
+msgid "Scan Side:"
+msgstr "Scangrootte:"
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
-msgstr "_Tekstresolutie:"
+msgid "Page Size:"
+msgstr "Paginagrootte:"
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
-msgstr "Gebr_uikersnaam voor bron:"
+msgid "Brightness:"
+msgstr "Helderheid:"
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
-msgstr "Documenten scannen"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr "Contrast:"
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
-msgstr "Te gebruiken scanapparaat"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr "Kwaliteit:"
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
-msgstr "Scanrichting"
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "Voor- en achterzijde"
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
-msgstr "Map om bestanden in op te slaan"
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "Voorzijde"
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
-msgstr "Hoogte van het papier in tienden van een mm"
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "Achterzijde"
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr "Hoogte van gescande afbeelding in pixels"
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "Documenten scannen"
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
-msgstr "Te scannen paginazijde"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "Vensterbreedte in pixels"
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
-msgstr "Resolutie voor gescande foto's"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "Vensterhoogte in pixels"
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
-msgstr "Resolutie voor gescande tekst"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "TRUE als het programmavenster gemaximaliseerd is"
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
-msgstr "Resolutie van laatste gescande afbeelding"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "Te gebruiken scanapparaat"
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
 msgstr "SANE-apparaat om beeld van te ontvangen"
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
-msgstr "TRUE als het programmavenster gemaximaliseerd is"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "Type document dat gescand wordt"
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
-"De richting van de scanner over de gescande pagina. Dit kan een van de "
-"volgende waarden zijn: 'top-to-bottom' 'bottom-to-top' 'left-to-right' "
-"'right-to-left'"
+"Het type document dat gescand wordt. Deze instelling bepaalt de te scannen "
+"resolutie, kleuren en nabewerking."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "Scanrichting"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "De richting van de scanner over de te scannen pagina."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "Breedte van gescande afbeelding in pixels"
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
 msgstr ""
-"De map waarin bestanden worden opgeslagen. Dit is standaard de map "
-"Documenten indien niet ingesteld."
+"De breedte van de gescande afbeelding in pixels. Deze waarde representeert "
+"de laatst gescande pagina."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "Hoogte van gescande afbeelding in pixels"
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
@@ -334,250 +355,255 @@ msgstr ""
 "De hoogte van de gescande afbeelding in pixels. Deze waarde representeert de "
 "laatst gescande pagina."
 
-#: ../data/simple-scan.schemas.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "Breedte van het papier in tienden van een mm"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
-"De hoogte van het papier in tienden van een mm (of 0 voor automatische "
+"De breedte van het papier in tienden van een mm (of 0 voor automatische "
 "papierdetectie)."
 
-#: ../data/simple-scan.schemas.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "Hoogte van het papier in tienden van een mm"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
 msgstr ""
-"De te scannen paginazijde. Het kan één van de volgende waarden bevatten: "
-"'both' 'front' 'back'"
+"De hoogte van het papier in tienden van een mm (of 0 voor automatische "
+"papierdetectie)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr "Helderheid van de scan"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Aanpassing van de helderheid van -100 tot 100 (0 is geen)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr "Contrast van de scan"
 
-#: ../data/simple-scan.schemas.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Aanpassing van het contrast van -100 tot 100 (0 is geen)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "Resolutie van laatste gescande afbeelding"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
 msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr ""
 "De resolutie in punten-per-inch (dtp) van de vorige gescande afbeelding."
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-"De te gebruiken resolutie in punten-per-inch (dtp) tijdens het scannen van "
-"foto's."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "Resolutie voor gescande tekst"
 
-#: ../data/simple-scan.schemas.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 "De te gebruiken resolutie in punten-per-inch (dtp) tijdens het scannen van "
 "tekst."
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"De breedte van de gescande afbeelding in pixels. Deze waarde representeert "
-"de laatst gescande pagina."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "Resolutie voor gescande foto's"
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
-"De breedte van het papier in tienden van een mm (of 0 voor automatische "
-"papierdetectie)."
+"De te gebruiken resolutie in punten-per-inch (dtp) tijdens het scannen van "
+"foto's."
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
-msgstr "Type document dat gescand wordt"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "Te scannen paginazijde"
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
-msgstr ""
-"Type document dat gescand wordt. 'text' voor tekstdocumenten, 'photo' voor "
-"foto's. Deze instelling bepaalt de scanresolutie, de kleuren en naverwerking."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "De paginazijde om te scannen."
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
-msgstr "Breedte van het papier in tienden van een mm"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "Map om bestanden in op te slaan"
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
-msgstr "Breedte van gescande afbeelding in pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"De map waarin bestanden worden opgeslagen. Dit is standaard de map "
+"Documenten indien niet ingesteld."
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
-msgstr "Vensterhoogte in pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr "De kwaliteitswaarde die gebruikt zal worden voor JPEG-compressie"
 
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
-msgstr "Vensterbreedte in pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr "De kwaliteitswaarde die gebruikt zal worden voor JPEG-compressie."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 "Geen scanners beschikbaar. Sluit een scanner aan om dit programma te "
 "gebruiken."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
 msgstr "Kan niet verbinden met de scanner"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
 msgstr "Kan de scan niet starten"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
 msgstr "Fout tijdens het communiceren met de scanner"
 
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Uitgaveversie tonen"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Debugberichten weergeven"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+"PDF-bestanden repareren die gegenereerd zijn door oudere versies van Simple "
+"Scan"
+
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
 msgstr "Scannen is mislukt"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
 msgstr "Gescand document"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
-msgstr ""
-"Gebruik:\n"
-"  %s [APPARAAT...] - Hulpmiddel voor scannen"
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[APPARAAT...] - Hulpmiddel voor scannen"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
+msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
-"Hulpopties:\n"
-"  -d, --debug                     Debugberichten weergeven\n"
-"  -v, --version                   Versienummer weergeven\n"
-"  -h, --help                      Hulpopties weergeven\n"
-"  --help-all                      Alle hulpopties weergeven\n"
-"  --help-gtk                      GTK+-opties weergeven"
-
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
-#, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
-msgstr ""
-"GTK+ Opties:\n"
-"  --class=KLASSE                   Programmaklasse, zoals gebruikt door de "
-"vensterbeheerder\n"
-"  --name=NAAM                     Programmanaam, zoals gebruikt door de "
-"vensterbeheerder\n"
-"  --screen=SCHERM                 Te gebruiken X-scherm\n"
-"  --sync                          X-aanroepen synchroon maken\n"
-"  --gtk-module=MODULES            Aanvullende GTK+-modules laden\n"
-"  --g-fatal-warnings              Alle waarschuwingen fataal maken"
+"Voer ‘%s --help’ uit om een volledige lijst van alle opdrachtregelopties te "
+"zien."
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "Gescand document.pdf"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Gebruikersnaam en wachtwoord vereist om toegang te krijgen tot  '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
 msgstr "Geen scanners gevonden"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
 msgstr "Controleer of uw scanner is aangesloten en is ingeschakeld"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr "PDF (document met meerdere pagina's)"
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr "JPEG (gecomprimeerd)"
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr "PNG (lossless)"
-
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
 msgstr "Opslaan als..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
 msgstr "Afbeeldingsbestanden"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
 msgstr "Alle bestanden"
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
 msgstr "Bestands_type selecteren"
 
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF (document met meerdere pagina's)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (gecomprimeerd)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (lossless)"
+
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
 msgstr "Bestand opslaan mislukt"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Als u niet opslaat, zullen wijzigingen permanent verloren gaan."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
 msgstr "Huidige document opslaan?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
 msgstr "Wijzigingen negeren"
 
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "Opslaan van afbeelding voor voorvertoning mislukt"
+
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
 msgstr "Kan toepassing voor voorvertoning van afbeelding niet openen"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
 msgstr "Kon hulpbestand niet openen"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -608,84 +634,191 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
 msgstr "Info over Scanhulpmiddel"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
 msgstr "Eenvoudig hulpmiddel voor het scannen van documenten"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Elco https://launchpad.net/~eajnab\n"
 "  Hannie Dumoleyn https://launchpad.net/~lafeber-dumoleyn\n"
-"  Heureka https://launchpad.net/~jan-de-ridder\n"
 "  Jeroen Hoek https://launchpad.net/~mail-jeroenhoek\n"
 "  Martijn Bastiaan https://launchpad.net/~hmb1\n"
 "  Michaël Van Dorpe https://launchpad.net/~michael-vandorpe\n"
-"  Pascal Pieters https://launchpad.net/~pascalaldo\n"
-"  Sense Hofstede https://launchpad.net/~sense\n"
-"  SvenVranckx https://launchpad.net/~sven-vranckx\n"
-"  cumulus007 https://launchpad.net/~cumulus-007"
+"  Rachid https://launchpad.net/~rachidbm\n"
+"  Robert Ancell https://launchpad.net/~robert-ancell\n"
+"  Sense Egbert Hofstede https://launchpad.net/~sense\n"
+"  Sven Vranckx https://launchpad.net/~sven-vranckx\n"
+"  Tico https://launchpad.net/~co-ti\n"
+"  Tino Meinen https://launchpad.net/~a-t-meinen\n"
+"  Wouter Bolsterlee (uws) https://launchpad.net/~uws\n"
+"  cumulus007 https://launchpad.net/~cumulus-007\n"
+"  kay https://launchpad.net/~kay20\n"
+"  rob https://launchpad.net/~rvdb"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
 msgstr "Document opslaan voor afsluiten?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
 msgstr "Afsluiten zonder opslaan"
 
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (standaard)"
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#: ../src/ui.vala:1292
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (klad)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
-#, c-format
-msgid "%d dpi"
-msgstr "%d dpi"
-
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (hoge resolutie)"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
-msgstr "%d dpi (standaard)"
+msgid "%d dpi"
+msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
 msgstr "Ontbrekende bestanden"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
 msgstr "Controleer uw installatie"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
 msgstr "_Scanner wijzigen"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
-msgstr "Gescand document.pdf"
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr "Donkerder"
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr "Lichter"
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr "Minder"
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr "Meer"
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr "Minimum"
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr "Maximum"
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "Bezig met opslaan van document..."
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "Bezig met opslaan van pagina %d van %d"
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "Gebruik:\n"
+#~ "  %s [APPARAAT...] - Hulpmiddel voor scannen"
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "GTK+ Opties:\n"
+#~ "  --class=KLASSE                   Programmaklasse, zoals gebruikt door de "
+#~ "vensterbeheerder\n"
+#~ "  --name=NAAM                     Programmanaam, zoals gebruikt door de "
+#~ "vensterbeheerder\n"
+#~ "  --screen=SCHERM                 Te gebruiken X-scherm\n"
+#~ "  --sync                          X-aanroepen synchroon maken\n"
+#~ "  --gtk-module=MODULES            Aanvullende GTK+-modules laden\n"
+#~ "  --g-fatal-warnings              Alle waarschuwingen fataal maken"
+
+#, c-format
+#~ msgid ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+#~ msgstr ""
+#~ "Hulpopties:\n"
+#~ "  -d, --debug                     Debugberichten weergeven\n"
+#~ "  -v, --version                   Versienummer weergeven\n"
+#~ "  -h, --help                      Hulpopties weergeven\n"
+#~ "  --help-all                      Alle hulpopties weergeven\n"
+#~ "  --help-gtk                      GTK+-opties weergeven"
+
+#~ msgid ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ msgstr ""
+#~ "De richting van de scanner over de gescande pagina. Dit kan een van de "
+#~ "volgende waarden zijn: 'top-to-bottom' 'bottom-to-top' 'left-to-right' "
+#~ "'right-to-left'"
+
+#~ msgid ""
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
+#~ msgstr ""
+#~ "Type document dat gescand wordt. 'text' voor tekstdocumenten, 'photo' voor "
+#~ "foto's. Deze instelling bepaalt de scanresolutie, de kleuren en naverwerking."
+
+#~ msgid ""
+#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ msgstr ""
+#~ "De te scannen paginazijde. Mogelijke waarden zijn ‘both’, ‘front’ en ‘back’."
diff --git a/po/oc.po b/po/oc.po
index e66507e..49378d7 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -7,327 +7,348 @@ msgid ""
 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-04-18 14:33+0000\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-07-23 09:04+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@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-10-22 04:48+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:45+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4 &#xD7; 6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Aisina de numerizacion simpla"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr "A_4"
+msgid "_Document"
+msgstr "_Document"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr "Nu_merizar"
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "_Pagina unica"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:10
 msgid "All Pages From _Feeder"
 msgstr "Totas las paginas del _nauc"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr ""
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
-msgstr "Requadrar"
+msgid "_Stop Scan"
+msgstr "_Arrestar la numerizacion"
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr "Requadrar la pagina seleccionada"
+msgid "Text"
+msgstr "Tèxte"
 
-#. Combo box label for scanning the front side of a page
+#. Combo box label for photo scan mode
 #: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr ""
+msgid "Photo"
+msgstr "Fòto"
 
-#. Combo box label for scanning both sides of a page
+#. Label on email menu item
 #: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr ""
+msgid "_Email"
+msgstr "_Corrièl"
 
-#. Radio button for cropping to page to US legal size
+#. Page menu (contains action for each page, e.g. delete, crop)
 #: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr "_Legal (US)"
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr "Novèl"
-
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr ""
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
-msgid "Photo"
-msgstr "Fotografia"
-
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr "Preferéncias"
-
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
-msgstr "Pivotar cap a esquèrra"
-
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr "Pivotar cap a drecha"
+msgid "_Page"
+msgstr "_Pagina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
+#: ../data/simple-scan.ui.h:22
 msgid "Rotate _Left"
 msgstr "Pivotar cap a es_quèrra"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
+#: ../data/simple-scan.ui.h:24
 msgid "Rotate _Right"
 msgstr "Pivotar cap a _drecha"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr ""
-"Pivotar la pagina cap a esquèrra (sens invèrse de las agulhas d'una mòstra)"
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "Re_quadrar"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Pivotar la pagina cap a drecha (sens de las agulhas d'una mòstra)"
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "_Pas cap"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
 
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "_Letter (US)"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "_Legal (US)"
+
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr "Salvar"
+msgid "4&#xD7;6"
+msgstr "4 &#xD7; 6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr ""
+msgid "_Custom"
+msgstr "_Personalizar"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr "Nu_merizar"
+msgid "_Rotate Crop"
+msgstr "Pivota_r la seleccion"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
-msgstr "Numerizar"
+msgid "Move Left"
+msgstr ""
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr "F_ont de numerizacion :"
+msgid "Move Right"
+msgstr ""
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr ""
+msgid "_Help"
+msgstr "_Ajuda"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
-msgstr "Numerizar una sola pagina dempuèi lo scanner"
-
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr "Numerizacion simpla"
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr "_Pagina unica"
+msgid "_Contents"
+msgstr "_Ensenhador"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
 msgstr "Crear un document novèl"
 
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "Novèl"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "Numerizar una sola pagina dempuèi lo scanner"
+
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
-msgstr "Arrestar"
+msgid "Scan"
+msgstr "Numerizar"
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr "Enregistrar lo document dins un fichièr"
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "Enregistrar"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
 msgid "Stop the current scan"
 msgstr "Arrestar la numerizacion en cors"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr "Tèxte"
-
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr "_Autorizar"
+msgid "Stop"
+msgstr "Arrèsta"
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
-msgstr "_Ensenhador"
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr ""
+"Pivotar la pagina cap a esquèrra (sens invèrse de las agulhas d'una mòstra)"
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr "Re_quadrar"
+msgid "Rotate Left"
+msgstr "Rotacion a esquèrra"
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr "_Personalizat"
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Pivotar la pagina cap a drecha (sens de las agulhas d'una mòstra)"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr "_Document"
+msgid "Rotate Right"
+msgstr "Rotacion a drecha"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "Requadrar la pagina seleccionada"
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
-msgstr "_Corrièl"
+msgid "Crop"
+msgstr "Requadrar"
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr "_Ajuda"
+msgid "_Username for resource:"
+msgstr "_Utilizaire :"
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr "_Letter (US)"
+msgid "_Password:"
+msgstr "Sen_hal :"
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr "_Pas cap"
+msgid "_Authorize"
+msgstr "_Autorizar"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr "_Pagina"
+msgid "Preferences"
+msgstr "Preferéncias"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr "Sen_hal :"
+msgid "Scan S_ource:"
+msgstr "F_ont de numerizacion :"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
-msgstr "Resolucion per _fòto :"
+msgid "_Text Resolution:"
+msgstr "Resolucion del _Tèxte :"
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr "Pivota_r la seleccion"
+msgid "_Photo Resolution:"
+msgstr "Resolucion de la _fòto :"
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
-msgstr "_Arrestar la numerizacion"
+msgid "Scan Side:"
+msgstr "Fàcia de numerizar :"
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
-msgstr "Resolucion del _Tèxte :"
+msgid "Page Size:"
+msgstr "Talha de la pagina :"
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
-msgstr "_Utilizaire :"
+msgid "Brightness:"
+msgstr "Luminositat :"
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
-msgstr "Numerizar de documents"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr "Contraste :"
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
-msgstr "Numerizar dempuèi"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
-msgstr "Sens de numerizacion"
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "Recto verso"
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
-msgstr "Dorsièr ont los fichièrs son enregistrats"
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "Fàcia"
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
-msgstr ""
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "Precedenta"
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr "Nautor de l'imatge numerizat en pixèls"
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "Numerizar de documents"
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "Largor de la fenèstra en pixèls"
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
-msgstr "Resolucion per de numerizacions de fòtos"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "Nautor de la fenèstra en pixèls"
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
-msgstr "Resolucion per de numerizacions de tèxtes"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "VERAI se la fenèstra de l'aplicacion es maximizada"
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
-msgstr "Resolucion del darrièr imatge numerizat"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "Numerizar dempuèi"
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
 msgstr "Periferic SANE d'utilizar per l'aquisicion dels imatges."
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
-msgstr "VERAI se la fenèstra de l'aplicacion es maximizada"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "Natura del document que va èsser numerizat"
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
-"Direccion del balejatge al moment de la numerizacion de la pagina. Aquela "
-"pòt èsser : d'amont cap aval ; d'aval cap amont ; d'esquèrra cap a drecha ; "
-"de drecha cap a esquèrra"
+"Tipe de document numerizat. Aqueste reglatge definís la resolucion de "
+"numerizacion, las colors e lo post-tractament."
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "Sens de numerizacion"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "Lo sens de l'escanèr per rapòrt a la pagina numerizada."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "Largor de l'imatge numerizat en pixèls"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
 msgstr ""
-"Lo dorsièr ont los fichièrs son enregistrats. S'es pas definit, lo dorsièr "
-"documents serà utilizat per defaut."
+"La largor de l'imatge numerizat en pixèls. Aquesta valor es mesa a jorn en "
+"foncion de la darrièra pagina numerizada."
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "Nautor de l'imatge numerizat en pixèls"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
@@ -335,241 +356,251 @@ msgstr ""
 "La nautor de l'imatge numerizat en pixèls. Aquesta valor es mesa a jorn en "
 "foncion de la darrièra pagina numerizada."
 
-#: ../data/simple-scan.schemas.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "Largor del papièr en desens de mm."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
+"La largor del papièr en desens de mm (o 0 per una deteccion automatica del "
+"papièr)."
 
-#: ../data/simple-scan.schemas.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "Nautor del papièr en desens de mm"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
 msgstr ""
+"La nautor del papièr en desens de mm (o 0 per una deteccion automatica del "
+"papièr)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr "Luminositat de la numerizacion"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Ajustament de la luminositat de -100 a 100 (0 per pas cap)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr "Contraste de la numerizacion"
 
-#: ../data/simple-scan.schemas.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Ajustament del contraste de -100 a 100 (0 per pas cap)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "Resolucion del darrièr imatge numerizat"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
 msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr "La resolucion del darrièr imatge numerizat en punts per poce."
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-"La resolucion en punts per poce d'utilizar al moment de la numerizacion de "
-"fòtos."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "Resolucion per de numerizacions de tèxtes"
 
-#: ../data/simple-scan.schemas.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 "La resolucion en punts per poce d'utilizar al moment de la numerizacion de "
 "tèxte."
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"La largor de l'imatge numerizat en pixèls. Aquesta valor es mesa a jorn en "
-"foncion de la darrièra pagina numerizada."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "Resolucion per de numerizacions de fòtos"
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
+"La resolucion en punts per poce d'utilizar al moment de la numerizacion de "
+"fòtos."
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
-msgstr "Natura del document que va èsser numerizat"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "Fàcia(s) de la pagina de numerizar"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "Lo costat de la pagina de numerizar."
 
-#: ../data/simple-scan.schemas.in.h:23
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "Dorsièr ont los fichièrs son enregistrats"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
 msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
+"The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
-"Natura del document que serà numerizat. « tèxte » pels documents tèxte, "
-"« fòto » per las fotografias. Aquel paramètre determina la resolucion de la "
-"numerizacion, lo nombre de colors e los tractaments posteriors."
+"Lo dorsièr ont los fichièrs son enregistrats. S'es pas definit, lo dorsièr "
+"documents serà utilizat per defaut."
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
-msgstr "Largor de l'imatge numerizat en pixèls"
-
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
-msgstr "Nautor de la fenèstra en pixèls"
-
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
-msgstr "Largor de la fenèstra en pixèls"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Cap de periferic de numerizacion pas disponible. Connectatz-ne un."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
 msgstr "Impossible de se connectar al scanner"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
 msgstr "Impossible d'aviar la numerizacion"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
 msgstr "Error de comunicacion amb lo scanner"
 
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Aficha la version del logicial"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Afichar los messatges de desbugatge"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+"Corregir los fichièrs PDF generats amb las ancianas versions de Simple Scan"
+
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
 msgstr "Fracàs de la numerizacion"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
 msgstr "Document numerizat"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
-msgstr ""
-"Usatge :\n"
-"  %s [PERIFERIC...] - utilitari de numerizacion"
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[DEVICE...] - Aisina de numerizacion"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
+msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
-"Opcions d'ajuda :\n"
-"  -d, --debug Aficha los messatges d'error\n"
-"  -v, --version Aficha lo numèro de version\n"
-"  -h, --help Aficha las opcions d'ajuda\n"
-"  --help-all Aficha totas las opcions d'ajuda\n"
-"  --help-gtk Aficha las opcions de GTK+"
-
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
-#, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
-msgstr ""
-"Opcions GTK+ :\n"
-"  --class=CLASSA Classa del programa tala coma utilizada pel gestionari de "
-"fenèstras\n"
-"  --name=NOM Nom del programa tal coma utilizat pel gestionari de fenèstras\n"
-"  --screen=ECRAN Ecran X d'utilizar\n"
-"  --sync Rendre los apèls X sincròns\n"
-"  --gtk-module=MODULS Cargar de moduls GTK+ suplementaris\n"
-"  --g-fatal-warnings Rendre totes los avertiments fatals"
+"Aviatz « %s --help » per veire la lista completa de opcions disponiblas en "
+"linha de comanda"
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "Document.pdf numerizat"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Nom d'utilizaire e senhal necessaris per accedir a « %s »"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
 msgstr "Cap de scanner es pas estat detectat"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
 msgstr "Verificatz que vòstre scanner es connectat e jos tension"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr "PDF (document multipaginas)"
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr "JPEG (compressat)"
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr "PNG (sens pèrda)"
-
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
 msgstr "Enregistrar jos..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
 msgstr "Fichièrs imatges"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
 msgstr "Totes los fichièrs"
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
 msgstr "Seleccionatz lo _tipe de fichièr"
 
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF (document multipaginas)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (compressat)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (sens pèrda)"
+
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
 msgstr "Impossible d'enregistrar lo fichièr"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
-msgstr ""
+msgstr "S'enregistratz pas, las modificacions seràn perdudas definitivament."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
-msgstr ""
+msgstr "Enregistrar lo document actual ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
-msgstr ""
+msgstr "Abandonar las modificacions"
+
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "Impossible d'enregistrar l'imatge per lo previsualizar"
 
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
 msgstr "Impossible de dobrir l'aplicacion de previsualizacion d'imatge"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
 msgstr "Impossible de dobrir lo fichièr d'ajuda"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -599,75 +630,179 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
 msgstr "A prepaus de Simple Scan"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
 msgstr "Numerizar simplament vòstres documents"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Cédric VALMARY (Tot en òc) https://launchpad.net/~cvalmary"
+"  Cédric VALMARY (Tot en òc) https://launchpad.net/~cvalmary\n"
+"  Quentin Pagès https://launchpad.net/~kwentin"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
-msgstr ""
+msgstr "Enregistrar lo document abans de quitar ?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
-msgstr ""
+msgstr "Quitar sens enregistrar"
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d ppp (per defaut)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#: ../src/ui.vala:1292
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (borrolhon)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
-#, c-format
-msgid "%d dpi"
-msgstr "%d ppp"
-
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d ppp (nauta resolucion)"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
-msgstr "%d ppp (per defaut)"
+msgid "%d dpi"
+msgstr "%d ppp"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
 msgstr "Fichièrs mancants"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
 msgstr "Verificatz vòstra installacion"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
 msgstr "Cambiar de _scanner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
+msgstr "Automatic"
+
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr "Mai escur"
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr "Mai clar"
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr "Mens"
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr "Mai"
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
-msgstr "Document.pdf numerizat"
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr ""
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "Enregistrament del document..."
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "Enregistrament de la pagina %d sus %d"
+
+#~ msgid ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ msgstr ""
+#~ "Direccion del balejatge al moment de la numerizacion de la pagina. Aquela "
+#~ "pòt èsser : d'amont cap aval ; d'aval cap amont ; d'esquèrra cap a drecha ; "
+#~ "de drecha cap a esquèrra"
+
+#~ msgid ""
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
+#~ msgstr ""
+#~ "Natura del document que serà numerizat. « tèxte » pels documents tèxte, "
+#~ "« fòto » per las fotografias. Aquel paramètre determina la resolucion de la "
+#~ "numerizacion, lo nombre de colors e los tractaments posteriors."
+
+#, c-format
+#~ msgid ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+#~ msgstr ""
+#~ "Opcions d'ajuda :\n"
+#~ "  -d, --debug Aficha los messatges d'error\n"
+#~ "  -v, --version Aficha lo numèro de version\n"
+#~ "  -h, --help Aficha las opcions d'ajuda\n"
+#~ "  --help-all Aficha totas las opcions d'ajuda\n"
+#~ "  --help-gtk Aficha las opcions de GTK+"
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "Usatge :\n"
+#~ "  %s [PERIFERIC...] - utilitari de numerizacion"
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "Opcions GTK+ :\n"
+#~ "  --class=CLASSA Classa del programa tala coma utilizada pel gestionari de "
+#~ "fenèstras\n"
+#~ "  --name=NOM Nom del programa tal coma utilizat pel gestionari de fenèstras\n"
+#~ "  --screen=ECRAN Ecran X d'utilizar\n"
+#~ "  --sync Rendre los apèls X sincròns\n"
+#~ "  --gtk-module=MODULS Cargar de moduls GTK+ suplementaris\n"
+#~ "  --g-fatal-warnings Rendre totes los avertiments fatals"
+
+#~ msgid ""
+#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ msgstr ""
+#~ "La o las fàcias de la pagina de numerizar. Aquò pòt èsser : « Recto verso », "
+#~ "« Recto » o « Verso »"
diff --git a/po/pa.po b/po/pa.po
new file mode 100644
index 0000000..2dfffca
--- /dev/null
+++ b/po/pa.po
@@ -0,0 +1,716 @@
+# Punjabi translation for simple-scan
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the simple-scan package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: simple-scan\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-04-17 06:12+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"Language-Team: Punjabi <pa@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: 2013-09-13 05:45+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
+
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "ਸੌਖਾ ਸਕੈਨ"
+
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: ../data/simple-scan.ui.h:4
+msgid "_Document"
+msgstr "ਡੌਕੂਮੈਂਟ(_D)"
+
+#. Scan menu item
+#: ../data/simple-scan.ui.h:6
+msgid "Sc_an"
+msgstr "ਸਕੈਨ ਕਰੋ(_a)"
+
+#. Toolbar scan menu item to scan a single page from the scanner
+#: ../data/simple-scan.ui.h:8
+msgid "Single _Page"
+msgstr "ਇੱਕਲਾ ਸਫ਼ਾ(_P)"
+
+#. Toolbar scan menu item to scan all pages from a document feeder
+#: ../data/simple-scan.ui.h:10
+msgid "All Pages From _Feeder"
+msgstr "ਫੀਡਰ ਤੋਂ ਸਭ ਸਫ਼ੇ(_F)"
+
+#. Menu entry to stop current scan
+#: ../data/simple-scan.ui.h:12
+msgid "_Stop Scan"
+msgstr "ਸਕੈਨ ਨੂੰ ਰੋਕੋ(_S)"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:14
+msgid "Text"
+msgstr "ਟੈਕਸਟ"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:16
+msgid "Photo"
+msgstr "ਫੋਟੋ"
+
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr "ਈਮੇਲ(_E)"
+
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr "ਸਫ਼ਾ(_P)"
+
+#. Menu item to rotate page to left (anti-clockwise)
+#: ../data/simple-scan.ui.h:22
+msgid "Rotate _Left"
+msgstr "ਖੱਬੇ ਘੁੰਮਾਓ(_L)"
+
+#. Menu item to rotate page to right (clockwise)
+#: ../data/simple-scan.ui.h:24
+msgid "Rotate _Right"
+msgstr "ਸੱਜੇ ਘੁੰਮਾਓ(_R)"
+
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "ਕਰੋਪ ਕਰੋ(_C)"
+
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "ਕੁਝ ਨਹੀਂ(_N)"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "ਪੱਤਰ(_L)"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "ਲੀਗਲ(_g)"
+
+#. Radio button for cropping page to 4x6 inch
+#: ../data/simple-scan.ui.h:40
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
+
+#. Radio button for cropping to custom page size
+#: ../data/simple-scan.ui.h:42
+msgid "_Custom"
+msgstr "ਕਸਟਮ(_C)"
+
+#. Menu item to rotate the crop area
+#: ../data/simple-scan.ui.h:44
+msgid "_Rotate Crop"
+msgstr "ਕਰੋਪ ਨੂੰ ਘੁੰਮਾਓ(_R)"
+
+#. Menu item to move the selected page to the left
+#: ../data/simple-scan.ui.h:46
+msgid "Move Left"
+msgstr ""
+
+#. Menu item to move the selected page to the right
+#: ../data/simple-scan.ui.h:48
+msgid "Move Right"
+msgstr ""
+
+#. Label on help menu
+#: ../data/simple-scan.ui.h:50
+msgid "_Help"
+msgstr "ਮੱਦਦ(_H)"
+
+#. Help|Contents menu
+#: ../data/simple-scan.ui.h:52
+msgid "_Contents"
+msgstr "ਸਮੱਗਰੀ(_C)"
+
+#. Tooltip for new document button
+#: ../data/simple-scan.ui.h:54
+msgid "Start a new document"
+msgstr "ਨਵਾਂ ਡੌਕੂਮੈਂਟ ਸ਼ੁਰੂ ਕਰੋ"
+
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "ਨਵਾਂ"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "ਸਕੈਨਰ ਤੋਂ ਇੱਕਲਾ ਸਫ਼ਾ ਸਕੈਨ ਕਰੋ"
+
+#. Label on scan toolbar item
+#: ../data/simple-scan.ui.h:59
+msgid "Scan"
+msgstr "ਸਕੈਨ"
+
+#. Tooltip for save toolbar button
+#: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr "ਡੌਕੂਮੈਂਟ ਫਾਇਲ ਵਿੱਚ ਸੰਭਾਲੋ"
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "ਸੰਭਾਲੋ"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
+msgid "Stop the current scan"
+msgstr "ਮੌਜੂਦਾ ਸਕੈਨ ਰੋਕੋ"
+
+#: ../data/simple-scan.ui.h:65
+msgid "Stop"
+msgstr "ਰੋਕੋ"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: ../data/simple-scan.ui.h:67
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "ਸਫ਼ੇ ਨੂੰ ਖੱਬੇ ਘੁੰਮਾਉ (ਘੜੀ ਦੀ ਉਲਟ ਦਿਸ਼ਾ ਵਿੱਚ)"
+
+#. Label on rotate page left (anti-clockwise) item
+#: ../data/simple-scan.ui.h:69
+msgid "Rotate Left"
+msgstr "ਖੱਬੇ ਘੁੰਮਾਓ"
+
+#. Tooltip for rotate right (clockwise) button
+#: ../data/simple-scan.ui.h:71
+msgid "Rotate the page to the right (clockwise)"
+msgstr "ਸਫ਼ੇ ਨੂੰ ਸੱਜੇ ਘੁੰਮਾਉ (ਘੜੀ ਦੀ ਦਿਸ਼ਾ ਵਿੱਚ)"
+
+#. Label on rotate page right (clockwise) item
+#: ../data/simple-scan.ui.h:73
+msgid "Rotate Right"
+msgstr "ਸੱਜੇ ਘੁੰਮਾਓ"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "ਚੁਣੇ ਸਫ਼ੇ ਨੂੰ ਕਰੋਪ ਕਰੋ"
+
+#: ../data/simple-scan.ui.h:75
+msgid "Crop"
+msgstr "ਕਰੋਪ ਕਰੋ"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:77
+msgid "_Username for resource:"
+msgstr "ਸਰੋਤ ਲਈ ਯੂਜ਼ਰ-ਨਾਂ(_U):"
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:79
+msgid "_Password:"
+msgstr "ਪਾਸਵਰਡ(_P):"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:81
+msgid "_Authorize"
+msgstr "ਪਰਮਾਣਿਤ(_A)"
+
+#. Title of preferences dialog
+#: ../data/simple-scan.ui.h:83
+msgid "Preferences"
+msgstr "ਮੇਰੀ ਪਸੰਦ"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:85
+msgid "Scan S_ource:"
+msgstr "ਸਕੈਨ ਸਰੋਤ(_o):"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:87
+msgid "_Text Resolution:"
+msgstr "ਟੈਕਸਟ ਰੈਜ਼ੋਲੂਸ਼ਨ(_T):"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:89
+msgid "_Photo Resolution:"
+msgstr "ਫੋਟੋ ਰੈਜ਼ੋਲੂਸ਼ਨ(_P):"
+
+#. Label beside scan side combo box
+#: ../data/simple-scan.ui.h:91
+msgid "Scan Side:"
+msgstr "ਸਕੈਨ ਸਾਈਡ"
+
+#. Label beside page size combo box
+#: ../data/simple-scan.ui.h:93
+msgid "Page Size:"
+msgstr "ਸਫਾ ਆਕਾਰ:"
+
+#. Label beside brightness scale
+#: ../data/simple-scan.ui.h:95
+msgid "Brightness:"
+msgstr ""
+
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr ""
+
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr ""
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "ਅੱਗੇ ਅਤੇ ਪਿੱਛੇ"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "ਅੱਗੇ"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "ਪਿੱਛੇ"
+
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "ਸਕੈਨ ਕੀਤੇ ਡੌਕੂਮੈਂਟ"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "ਸਕੈਨ ਕਰਨ ਲਈ ਜੰਤਰ"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+msgid "SANE device to acquire images from."
+msgstr "ਚਿੱਤਰ ਲੈਣ ਲਈ ਸੈਨ (SANE) ਜੰਤਰ"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "ਸਕੈਨ ਕੀਤੇ ਜਾਣ ਵਾਲੇ ਡੌਕੂਮੈਂਟ ਦੀ ਕਿਸਮ"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "ਸਕੈਨ ਦੀ ਦਿਸ਼ਾ"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
+msgid ""
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
+msgid ""
+"The height of scanned image in pixels. This value is updated to what the "
+"last scanned page was."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "ਆਖਰੀ ਸਕੈਨ ਕੀਤੇ ਚਿੱਤਰ ਦਾ ਰੈਜ਼ੋਲੂਸ਼ਨ"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
+msgid "The resolution in dots-per-inch of the previously scanned image."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "ਟੈਕਸਟ ਸਕੈਨ ਲਈ ਰੈਜ਼ੋਲੂਸ਼ਨ"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "ਫੋਟੋ ਸਕੈਨ ਲਈ ਰੈਜੋਲੂਸ਼ਨ"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "ਸਕੈਨ ਕਰਨ ਲਈ ਸਫ਼ੇ ਦਾ ਪਾਸਾ"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "ਫਾਇਲਾਂ ਸੰਭਾਲਣ ਲਈ ਡਾਇਰੈਕਟਰੀ"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"ਫਾਇਲਾਂ ਸੰਭਾਲਣ ਲਈ ਡਾਇਰੈਕਟਰੀ ਹੈ। ਜੇ ਸੈੱਟ ਨਾ ਕੀਤਾ ਤਾਂ ਡਿਫਾਲਟ ਡੌਕੂਮੈਂਟ ਡਾਇਰੈਕਟਰੀ "
+"ਹੈ।"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr ""
+
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:814
+msgid "No scanners available.  Please connect a scanner."
+msgstr "ਕੋਈ ਵੀ ਸਕੈਨਰ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ। ਸਕੈਨਰ ਨਾਲ ਕੁਨੈਕਟ ਕਰੋ ਜੀ।"
+
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:844
+msgid "Unable to connect to scanner"
+msgstr "ਸਕੈਨਰ ਨਾਲ ਜੁੜਨ ਲਈ ਅਸਮਰੱਥ"
+
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1207
+msgid "Unable to start scan"
+msgstr "ਸਕੈਨ ਕਰਨਾ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
+
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+msgid "Error communicating with scanner"
+msgstr "ਸਕੈਨਰ ਨਾਲ ਸੰਚਾਰ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
+
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr ""
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr ""
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:297
+msgid "Failed to scan"
+msgstr "ਸਕੈਨ ਕਰਨ ਲਈ ਫੇਲ੍ਹ"
+
+#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
+#: ../src/simple-scan.vala:316
+msgid "Scanned Document"
+msgstr "ਸਕੈਨ ਕੀਤੇ ਡੌਕੂਮੈਂਟ"
+
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr ""
+
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
+#, c-format
+msgid "Run '%s --help' to see a full list of available command line options."
+msgstr ""
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "ਸਕੈਨ ਕੀਤਾ ਡੌਕੂਮੈਂਟ.pdf"
+
+#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
+#: ../src/ui.vala:159
+#, c-format
+msgid "Username and password required to access '%s'"
+msgstr "'%s' ਵਰਤਣ ਲਈ ਯੂਜ਼ਰ-ਨਾਂ ਅਤੇ ਪਾਸਵਰਡ ਚਾਹੀਦਾ ਹੈ"
+
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:202
+msgid "No scanners detected"
+msgstr "ਕੋਈ ਸਕੈਨਰ ਨਹੀਂ ਮਿਲਿਆ"
+
+#. Hint to user on why there are no scanners detected
+#: ../src/ui.vala:204
+msgid "Please check your scanner is connected and powered on"
+msgstr "ਆਪਣੇ ਜੁੜ ਹੋਏ ਸਕੈਨਰ ਨੂੰ ਚੈੱਕ ਕਰੋ ਅਤੇ ਚਾਲੂ ਕਰੋ"
+
+#. Save dialog: Dialog title
+#: ../src/ui.vala:363
+msgid "Save As..."
+msgstr "ਇੰਝ ਸੰਭਾਲੋ..."
+
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:377
+msgid "Image Files"
+msgstr "ਚਿੱਤਰ ਫਾਇਲਾਂ"
+
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:383
+msgid "All Files"
+msgstr "ਸਭ ਫਾਇਲਾਂ"
+
+#. 
+#: ../src/ui.vala:388
+msgid "Select File _Type"
+msgstr "ਫਾਇਲ ਕਿਸਮ ਚੁਣੋ(_T)"
+
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF (ਬਹੁ-ਸਫ਼ਾ ਡੌਕੂਮੈਂਟ)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (compressed)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (lossless)"
+
+#. Title of error dialog when save failed
+#: ../src/ui.vala:503
+msgid "Failed to save file"
+msgstr "ਫਾਇਲ ਸੰਭਾਲਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:526
+msgid "If you don't save, changes will be permanently lost."
+msgstr "ਜੇ ਤੁਸੀਂ ਨਾ ਸੰਭਾਲਿਆ ਤਾਂ ਸਭ ਬਦਲਾਅ ਖਤਮ ਹੋ ਜਾਣਗੇ।"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:563
+msgid "Save current document?"
+msgstr "ਮੌਜੂਦਾ ਡੌਕੂਮੈਂਟ ਸੰਭਾਲਣਾ ਹੈ?"
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:565
+msgid "Discard Changes"
+msgstr "ਬਦਲਾਅ ਅਣਡਿੱਠੇ"
+
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.vala:872
+msgid "Unable to open image preview application"
+msgstr "ਚਿੱਤਰ ਝਲਕ ਐਪਲੀਕੇਸ਼ਨ ਖੋਲ੍ਹਣ ਲਈ ਅਸਮਰੱਥ"
+
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1119
+msgid "Unable to open help file"
+msgstr "ਮੱਦਦ ਫਾਇਲ ਖੋਲ੍ਹਣ ਲਈ ਅਸਮਰੱਥ"
+
+#. The license this software is under (GPL3+)
+#: ../src/ui.vala:1130
+msgid ""
+"This program is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 3 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program.  If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+
+#. Title of about dialog
+#: ../src/ui.vala:1133
+msgid "About Simple Scan"
+msgstr "ਸੈਂਪਲ ਸਕੈਨ ਬਾਰੇ"
+
+#. Description of program
+#: ../src/ui.vala:1136
+msgid "Simple document scanning tool"
+msgstr "ਸੈਂਪਲ ਡੌਕੂਮੈਂਟ ਸਕੈਨਿੰਗ ਟੂਲ"
+
+#: ../src/ui.vala:1145
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  A S Alam https://launchpad.net/~aalam-users"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1156
+msgid "Save document before quitting?"
+msgstr "ਕੀ ਬੰਦ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਡੌਕੂਮੈਂਟ ਸੰਭਾਲਣਾ ਹੈ?"
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1158
+msgid "Quit without Saving"
+msgstr "ਬਿਨਾਂ ਸੰਭਾਲੇ ਬੰਦ ਕਰਨਾ ਹੈ"
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (ਡਿਫਾਲਟ)"
+
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1292
+#, c-format
+msgid "%d dpi (draft)"
+msgstr "%d dpi (draft)"
+
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1295
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr "%d dpi (ਵੱਧ ਰੈਜ਼ੋਲੂਸ਼ਨ)"
+
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
+#, c-format
+msgid "%d dpi"
+msgstr "%d dpi"
+
+#. Title of dialog when cannot load required files
+#: ../src/ui.vala:1333
+msgid "Files missing"
+msgstr ""
+
+#. Description in dialog when cannot load required files
+#: ../src/ui.vala:1335
+msgid "Please check your installation"
+msgstr "ਆਪਣੀ ਇੰਸਟਾਲੇਸ਼ਨ ਚੈੱਕ ਕਰੋ ਜੀ"
+
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1403
+msgid "Change _Scanner"
+msgstr "ਸਕੈਨਰ ਬਦਲੋ(_S)"
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1409
+msgid "Automatic"
+msgstr "ਆਟੋਮੈਟਿਕ"
+
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr ""
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr ""
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr ""
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr ""
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr ""
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr ""
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr ""
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr ""
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "ਵਰਤੋਂ:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
diff --git a/po/pl.po b/po/pl.po
index 0ebcb75..f209f54 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,327 +7,347 @@ msgid ""
 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-10-31 10:12+0000\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2013-09-11 23:15+0000\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <pl@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-11-01 05:18+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:45+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4x6\""
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Proste skanowanie"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr "A_4"
+msgid "_Document"
+msgstr "_Dokument"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr "Sk_anowanie"
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "_Pojedyncza strona"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:10
 msgid "All Pages From _Feeder"
 msgstr "_Wszystkie strony z podajnika"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr "Tył"
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
-msgstr "Przytnij"
+msgid "_Stop Scan"
+msgstr "Zatrzymaj _skanowanie"
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr "Przycina wybraną stronę"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr "Przód"
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr "Przód i tył"
-
-#. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr "Le_gal"
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr "Nowy"
-
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr "Rozmiar strony:"
+msgid "Text"
+msgstr "Tekst"
 
 #. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
+#: ../data/simple-scan.ui.h:16
 msgid "Photo"
 msgstr "Zdjęcie"
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr "Preferencje"
-
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
-msgstr "Obróć w lewo"
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr "_E-mail"
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr "Obróć w prawo"
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr "_Strona"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
+#: ../data/simple-scan.ui.h:22
 msgid "Rotate _Left"
 msgstr "Obróć w _lewo"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
+#: ../data/simple-scan.ui.h:24
 msgid "Rotate _Right"
 msgstr "Obróć w p_rawo"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Obraca stronę w lewo (przeciwnie do wskazówek zegara)"
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "_Przytnij"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Obraca stronę w prawo (zgodnie ze wskazówkami zegara)"
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "_Brak"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
 
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "_Letter"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "Le_gal"
+
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr "Zapisz"
+msgid "4&#xD7;6"
+msgstr "4x6\""
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr "Zapisuje dokument do pliku"
+msgid "_Custom"
+msgstr "_Własny"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr "Sk_anowanie"
+msgid "_Rotate Crop"
+msgstr "Ob_róć obszar przycięcia"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
-msgstr "Skanuj"
+msgid "Move Left"
+msgstr "Przesuń w lewo"
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr "Źródło skan_owania:"
+msgid "Move Right"
+msgstr "Przesuń w prawo"
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr "Skanowanie stron:"
+msgid "_Help"
+msgstr "Pomo_c"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
-msgstr "Skanuje pojedynczą stronę ze skanera"
-
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr "Proste skanowanie"
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr "_Pojedyncza strona"
+msgid "_Contents"
+msgstr "_Spis treści"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
-msgstr "Rozpoczyna nowy dokument"
+msgstr "Tworzy nowy dokument"
 
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "Nowy"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "Skanuje pojedynczą stronę ze skanera"
+
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
-msgstr "Zatrzymaj"
+msgid "Scan"
+msgstr "Skanuj"
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr "Zapisuje dokument do pliku"
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "Zapisz"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
 msgid "Stop the current scan"
 msgstr "Zatrzymuje bieżące skanowanie"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr "Tekst"
-
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr "Upow_ażnij"
+msgid "Stop"
+msgstr "Zatrzymaj"
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
-msgstr "_Spis treści"
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Obraca stronę w lewo (przeciwnie do wskazówek zegara)"
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr "_Przytnij"
+msgid "Rotate Left"
+msgstr "Obróć w lewo"
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr "Rozmiar _użytkownika"
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Obraca stronę w prawo (zgodnie ze wskazówkami zegara)"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr "_Dokument"
+msgid "Rotate Right"
+msgstr "Obróć w prawo"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "Przycina wybraną stronę"
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
-msgstr "_E-mail"
+msgid "Crop"
+msgstr "Przytnij"
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr "Pomo_c"
+msgid "_Username for resource:"
+msgstr "Nazwa _użytkownika dla zasobu:"
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr "_Letter"
+msgid "_Password:"
+msgstr "_Hasło:"
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr "_Brak"
+msgid "_Authorize"
+msgstr "Upow_ażnij"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr "_Strona"
+msgid "Preferences"
+msgstr "Preferencje"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr "_Hasło:"
+msgid "Scan S_ource:"
+msgstr "Źródło skan_owania:"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
-msgstr "Rozdzielczość z_djęcia:"
+msgid "_Text Resolution:"
+msgstr "_Rozdzielczość tekstu:"
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr "Ob_róć obszar przycięcia"
+msgid "_Photo Resolution:"
+msgstr "Rozdzielczość z_djęcia:"
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
-msgstr "Zatrzymaj _skanowanie"
+msgid "Scan Side:"
+msgstr "Skanowanie stron:"
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
-msgstr "_Rozdzielczość tekstu:"
+msgid "Page Size:"
+msgstr "Rozmiar strony:"
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
-msgstr "Nazwa _użytkownika dla zasobu:"
+msgid "Brightness:"
+msgstr "Jasność:"
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
-msgstr "Skanowanie dokumentów"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr "Kontrast:"
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
-msgstr "Urządzenie skanujące"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr "Jakość:"
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
-msgstr "Kierunek skanowania"
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "Przód i tył"
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
-msgstr "Katalog do zapisania plików"
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "Przód"
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
-msgstr "Wysokość papieru w dziesiątkach milimetrów"
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "Tył"
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr "Wysokość zeskanowanego obrazu w pikselach"
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "Skanowanie dokumentów"
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
-msgstr "Strona do skanowania"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "Szerokość okna w pikselach"
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
-msgstr "Rozdzielczość skanowanych zdjęć"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "Wysokość okna w pikselach"
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
-msgstr "Rozdzielczość skanowanego tekstu"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "Wartość \"True\", jeśli okno programu jest zmaksymalizowane"
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
-msgstr "Rozdzielczość ostatnio zeskanowanego obrazu"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "Urządzenie skanujące"
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
 msgstr "Urządzenie SANE do pobierania obrazu."
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
-msgstr "Wartość \"True\", jeśli okno programu jest zmaksymalizowane"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "Typ skanowanego dokumentu"
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
-"Kierunek skanowania na skanowanej stronie. Może być jednym z następujących: "
-"\"top-to-bottom\" (od góry do dołu), \"bottom-to-top\" (od dołu do góry), "
-"\"left-to-right\" (od lewej do prawej), \"right-to-left\" (od prawej do "
-"lewej)"
+"Typ skanowanego dokumentu. To ustawienie decyduje o rozdzielczości "
+"skanowania, kolorach i przetwarzaniu końcowym."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "Kierunek skanowania"
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "Kierunek skanowania strony."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "Szerokość zeskanowanego obrazu w pikselach"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
 msgstr ""
-"Katalog do zapisywania plików. Jeśli nie ustawiono, używa domyślnego "
-"katalogu Dokumenty."
+"Szerokość zeskanowanego obrazu w pikselach. Ta wartość jest aktualizowana do "
+"tej, jaka wynosiła podczas ostatniego skanowania."
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "Wysokość zeskanowanego obrazu w pikselach"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
@@ -335,246 +355,246 @@ msgstr ""
 "Wysokość zeskanowanego obrazu w pikselach. Ta wartość jest aktualizowana do "
 "tej, jaka wynosiła podczas ostatniego skanowania."
 
-#: ../data/simple-scan.schemas.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "Szerokość papieru w dziesiątkach milimetrów"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
-"Wysokość papieru w dziesiątkach milimetrów (lub 0 dla automatycznego "
+"Szerokość papieru w dziesiątkach milimetrów (lub 0 dla automatycznego "
 "wykrywania papieru)."
 
-#: ../data/simple-scan.schemas.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "Wysokość papieru w dziesiątkach milimetrów"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
 msgstr ""
-"Strona do skanowania. Może wynosić jedną z wartości: \"both\" (obie), "
-"\"front\" (przód), \"back\" (tył)"
+"Wysokość papieru w dziesiątkach milimetrów (lub 0 dla automatycznego "
+"wykrywania papieru)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr "Jasność skanowania"
 
-#: ../data/simple-scan.schemas.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Dostosowanie jasności, od -100 do 100 (0 oznacza brak)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr "Kontrast skanowania"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Dostosowanie kontrastu, od -100 do 100 (0 oznacza brak)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "Rozdzielczość ostatnio zeskanowanego obrazu"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
 msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr "Rozdzielczość ostatnio skanowanego obrazu w punktach na cal (dpi)."
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-"Rozdzielczość do użycia podczas skanowania zdjęć w punktach na cal (dpi)."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "Rozdzielczość skanowanego tekstu"
 
-#: ../data/simple-scan.schemas.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 "Rozdzielczość do użycia podczas skanowania tekstu w punktach na cal (dpi)."
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"Szerokość zeskanowanego obrazu w pikselach. Ta wartość jest aktualizowana do "
-"tej, jaka wynosiła podczas ostatniego skanowania."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "Rozdzielczość skanowanych zdjęć"
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
-"Szerokość papieru w dziesiątkach milimetrów (lub 0 dla automatycznego "
-"wykrywania papieru)."
+"Rozdzielczość do użycia podczas skanowania zdjęć w punktach na cal (dpi)."
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
-msgstr "Typ skanowanego dokumentu"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "Strona do skanowania"
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
-msgstr ""
-"Typ skanowanego dokumentu. Wartość \"text\" (tekst) dla dokumentów "
-"tekstowych, \"photo\" (zdjęcie) dla zdjęć. To ustawienie decyduje o "
-"rozdzielczości skanowania, kolorach i możliwości późniejszej obróbki."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "Strona kartki do skanowania."
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
-msgstr "Szerokość papieru w dziesiątkach milimetrów"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "Katalog do zapisania plików"
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
-msgstr "Szerokość zeskanowanego obrazu w pikselach"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Katalog do zapisywania plików. Jeśli nie ustawiono, używa domyślnego "
+"katalogu Dokumenty."
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
-msgstr "Wysokość okna w pikselach"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr "Wartość jakości używana do kompresji JPEG"
 
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
-msgstr "Szerokość okna w pikselach"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr "Wartość jakości używana do kompresji JPEG."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Brak dostępnych skanerów. Proszę podłączyć skaner."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
 msgstr "Nie można połączyć się ze skanerem"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
 msgstr "Nie można rozpocząć skanowania"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
 msgstr "Błąd podczas komunikacji ze skanerem"
 
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Wypisuje inforamacje o wersji"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Wypisuje komunikaty diagnozowania błędów"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr "Naprawia pliki PDF utworzone przy użyciu starszych wersji programu"
+
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
 msgstr "Skanowanie się nie powiodło"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
 msgstr "Zeskanowany dokument"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
-msgstr ""
-"Użycie:\n"
-"  %s [URZĄDZENIE...] - Narzędzie do skanowania"
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[URZĄDZENIE] - Narzędzie do skanowania"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
-#, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
-msgstr ""
-"Opcje pomocy:\n"
-"  -d, --debug                     Wyświetla komunikaty drukowania\n"
-"  -v, --version                   Wyświetla wersję programu\n"
-"  -h, --help                      Wyświetla opcje pomocy\n"
-"  --help-all                      Wyświetla wszystkie opcje pomocy\n"
-"  --help-gtk                      Wyświetla opcje GTK+"
-
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
-msgstr ""
-"Opcje GTK+:\n"
-"  --class=KLASA                   Klasa programu używana przez menedżera "
-"okien\n"
-"  --name=NAZWA                    Nazwa programu używana przez menedżera "
-"okien\n"
-"  --screen=EKRAN                  Używany ekran X\n"
-"  --sync                          Synchroniczne wywołania X\n"
-"  --gtk-module=MODUŁY             Wczytuje dodatkowe moduły GTK+\n"
-"  --g-fatal-warnings              Wszystkie ostrzeżenia są krytyczne"
+msgid "Run '%s --help' to see a full list of available command line options."
+msgstr "Proszę wprowadzić „%s --help”, aby wypisać komunikat pomocy."
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "Zeskanowany dokument.pdf"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Uzyskanie dostępu do \"%s\" wymaga podania nazwy użytkownika i hasła"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
 msgstr "Nie wykryto żadnego skanera"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
 msgstr "Proszę sprawdzić, czy skaner jest podłączony i włączony"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr "PDF (dokument wielostronicowy)"
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr "JPEG (skompresowany)"
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr "PNG (bezstratny)"
-
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
 msgstr "Zapisz jako..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
 msgstr "Pliki obrazów"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
 msgstr "Wszystkie pliki"
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
 msgstr "Proszę wybrać _typ pliku"
 
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF (dokument wielostronicowy)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (skompresowany)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (bezstratny)"
+
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
 msgstr "Zapisanie pliku się nie powiodło"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Zmiany zostaną bezpowrotnie utracone, jeśli nie zostaną zapisane."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
 msgstr "Zapisać bieżący dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
 msgstr "Odrzuć zmiany"
 
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "Nie można zapisać podglądu obrazu"
+
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
 msgstr "Nie można otworzyć programu podglądu obrazów"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
 msgstr "Nie można otworzyć pliku pomocy"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -606,82 +626,197 @@ msgstr ""
 "- proszę odwiedzić stronę internetową <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
 msgstr "O programie"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
 msgstr "Proste narzędzie do skanowania dokumentów"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Andrzej Książkiewicz https://launchpad.net/~ksiaze\n"
+"  Arkadiusz Błasiak https://launchpad.net/~ares1112\n"
+"  GTriderXC https://launchpad.net/~gtriderxc\n"
+"  Kuba Mędrek https://launchpad.net/~kubix-medrek\n"
+"  Marcin Kozioł https://launchpad.net/~lord-dark666\n"
 "  Michał Sawicz https://launchpad.net/~saviq\n"
 "  Miłosz Kosobucki https://launchpad.net/~mikom\n"
+"  P.W. https://launchpad.net/~piwsko\n"
 "  Piotr Drąg https://launchpad.net/~raven46\n"
+"  Piotr Sokół https://launchpad.net/~psokol\n"
 "  Piotr Strębski https://launchpad.net/~strebski\n"
-"  Piotr Wicijowski https://launchpad.net/~piwsko\n"
+"  Piotr Łukomiak https://launchpad.net/~pioluk\n"
+"  Rafał Szalecki https://launchpad.net/~perex\n"
+"  Szymon Waliczek https://launchpad.net/~majster-pl\n"
 "  Tomasz 'Zen' Napierala https://launchpad.net/~tzn\n"
+"  Tomasz Dominikowski https://launchpad.net/~dominikowski\n"
+"  Wiatrak https://launchpad.net/~wiatrak.\n"
 "  tomko222 https://launchpad.net/~tomko222"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
 msgstr "Zapisać dokument przed zakończeniem programu?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
 msgstr "Zakończ bez zapisywania"
 
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (domyślnie)"
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#: ../src/ui.vala:1292
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (szkic)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
-#, c-format
-msgid "%d dpi"
-msgstr "%d dpi"
-
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (wysoka rozdzielczość)"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
-msgstr "%d dpi (domyślnie)"
+msgid "%d dpi"
+msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
 msgstr "Nie można odnaleźć plików"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
 msgstr "Proszę sprawdzić poprawność instalacji"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
 msgstr "Zmień _skaner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
 msgstr "Automatyczny"
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
-msgstr "Zeskanowany dokument.pdf"
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr "Ciemniej"
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr "Jaśniej"
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr "Mniejszy"
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr "Większy"
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr "Minimalnie"
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr "Maksymalnie"
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "Zapisywanie dokumentu..."
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "Zapisywanie strony %d z %d"
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "Użycie:\n"
+#~ "  %s [URZĄDZENIE...] - Narzędzie do skanowania"
+
+#~ msgid ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ msgstr ""
+#~ "Kierunek skanowania na skanowanej stronie. Może być jednym z następujących: "
+#~ "\"top-to-bottom\" (od góry do dołu), \"bottom-to-top\" (od dołu do góry), "
+#~ "\"left-to-right\" (od lewej do prawej), \"right-to-left\" (od prawej do "
+#~ "lewej)"
+
+#~ msgid ""
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
+#~ msgstr ""
+#~ "Typ skanowanego dokumentu. Wartość \"text\" (tekst) dla dokumentów "
+#~ "tekstowych, \"photo\" (zdjęcie) dla zdjęć. To ustawienie decyduje o "
+#~ "rozdzielczości skanowania, kolorach i możliwości późniejszej obróbki."
+
+#, c-format
+#~ msgid ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+#~ msgstr ""
+#~ "Opcje pomocy:\n"
+#~ "  -d, --debug                     Wyświetla komunikaty drukowania\n"
+#~ "  -v, --version                   Wyświetla wersję programu\n"
+#~ "  -h, --help                      Wyświetla opcje pomocy\n"
+#~ "  --help-all                      Wyświetla wszystkie opcje pomocy\n"
+#~ "  --help-gtk                      Wyświetla opcje GTK+"
+
+#~ msgid ""
+#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ msgstr ""
+#~ "Strona do skanowania. Może wynosić jedną z wartości: \"both\" (obie), "
+#~ "\"front\" (przód), \"back\" (tył)"
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "Opcje GTK+:\n"
+#~ "  --class=KLASA                   Klasa programu używana przez menedżera "
+#~ "okien\n"
+#~ "  --name=NAZWA                    Nazwa programu używana przez menedżera "
+#~ "okien\n"
+#~ "  --screen=EKRAN                  Używany ekran X\n"
+#~ "  --sync                          Synchroniczne wywołania X\n"
+#~ "  --gtk-module=MODUŁY             Wczytuje dodatkowe moduły biblioteki GTK+\n"
+#~ "  --g-fatal-warnings              Wszystkie ostrzeżenia są krytyczne"
diff --git a/po/pt.po b/po/pt.po
index ad2666a..ce79454 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,326 +7,347 @@ msgid ""
 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-11-14 23:10+0000\n"
-"Last-Translator: Diogo Lavareda <diogolavareda9@hotmail.com>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-08-28 14:11+0000\n"
+"Last-Translator: Gusrubin <gusrubin@gmail.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-11-15 05:11+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:45+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Digitalização Simples"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr "A_4"
+msgid "_Document"
+msgstr "_Documento"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr "Digit_alizar"
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "_Página Única"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:10
 msgid "All Pages From _Feeder"
 msgstr "Todas as páginas a partir do _Alimentador"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr "Verso"
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
-msgstr "Recortar"
+msgid "_Stop Scan"
+msgstr "_Parar Digitalização"
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr "Cortar a página seleccionada"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr "Frente"
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr "Frente e Verso"
-
-#. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr "Le_gal"
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr "Novo"
-
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr "Tamanho da Página:"
+msgid "Text"
+msgstr "Texto"
 
 #. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
+#: ../data/simple-scan.ui.h:16
 msgid "Photo"
 msgstr "Foto"
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr "Preferências"
-
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
-msgstr "Rodar para a Esquerda"
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr "_Email"
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr "Rodar para a Direita"
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr "_Página"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
+#: ../data/simple-scan.ui.h:22
 msgid "Rotate _Left"
 msgstr "Rodar para a _Esquerda"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
+#: ../data/simple-scan.ui.h:24
 msgid "Rotate _Right"
 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 "Rodar a página para a esquerda (contra ponteiros do relógio)"
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "_Cortar"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Rodar a página para a direita (ponteiros do relógio)"
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "_Nenhum"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
 
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "_Carta"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "Le_gal"
+
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr "Guardar"
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr "Guardar documento num ficheiro"
+msgid "_Custom"
+msgstr "_Personalizar"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr "Digit_alizar"
+msgid "_Rotate Crop"
+msgstr "_Rodar Recorte"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
-msgstr "Digitalizar"
+msgid "Move Left"
+msgstr "Mover para a Esquerda"
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr "Origem da Digitalizaçã_o:"
+msgid "Move Right"
+msgstr "Mover para a Direita"
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr "Lado da digitalização"
+msgid "_Help"
+msgstr "_Ajuda"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
-msgstr "Digitalizar uma página no digitalizador"
-
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr "Simple Scan"
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr "_Página Única"
+msgid "_Contents"
+msgstr "_Conteúdos"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
 msgstr "Iniciar um novo documento"
 
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "Novo"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "Digitalizar uma página no digitalizador"
+
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
-msgstr "Parar"
+msgid "Scan"
+msgstr "Digitalizar"
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr "Guardar documento num ficheiro"
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "Guardar"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
 msgid "Stop the current scan"
 msgstr "Parar a digitalização actual"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr "Texto"
-
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr "_Autorizar"
+msgid "Stop"
+msgstr "Parar"
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
-msgstr "_Conteúdos"
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Rodar a página para a esquerda (contra ponteiros do relógio)"
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr "_Cortar"
+msgid "Rotate Left"
+msgstr "Rodar para a Esquerda"
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr "_Personalizar"
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Rodar a página para a direita (ponteiros do relógio)"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr "_Documento"
+msgid "Rotate Right"
+msgstr "Rodar para a Direita"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "Cortar a página selecionada"
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
-msgstr "_Email"
+msgid "Crop"
+msgstr "Recortar"
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr "_Ajuda"
+msgid "_Username for resource:"
+msgstr "Nome do _utilizador para o recurso:"
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr "_Carta"
+msgid "_Password:"
+msgstr "_Palavra-Passe:"
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr "_Nenhum"
+msgid "_Authorize"
+msgstr "_Autorizar"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr "_Página"
+msgid "Preferences"
+msgstr "Preferências"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr "_Palavra-Passe:"
+msgid "Scan S_ource:"
+msgstr "Origem da Digitalizaçã_o:"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
-msgstr "_Resolução da Foto:"
+msgid "_Text Resolution:"
+msgstr "Resolução do _Texto:"
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr "_Rodar Recorte"
+msgid "_Photo Resolution:"
+msgstr "_Resolução da Foto:"
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
-msgstr "_Parar Digitalização"
+msgid "Scan Side:"
+msgstr "Lado da digitalização"
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
-msgstr "Resolução do _Texto:"
+msgid "Page Size:"
+msgstr "Tamanho da Página:"
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
-msgstr "Nome do _utilizador para o recurso:"
+msgid "Brightness:"
+msgstr "Brilho:"
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
-msgstr "Digitalizar Documentos"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr "Contraste:"
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
-msgstr "Dispositivo de onde digitalizar"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr "Qualidade:"
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
-msgstr "Direcção da digitalização"
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "Frente e Verso"
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
-msgstr "Pasta para guardar os ficheiros"
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "Frente"
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
-msgstr "Altura da folha em décimos de mm"
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "Verso"
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr "Altura da imagem digitalizada em pixeis"
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "Digitalizar Documentos"
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
-msgstr "Lado da página a digitalizar"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "Largura da janela em pixels"
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
-msgstr "Resolução para digitalização de fotos"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "Altura da janela em pixels"
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
-msgstr "Resolução para digitalização de textos"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "VERDADE se a janela da aplicação está maximizada."
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
-msgstr "Resolução da última imagem digitalizada"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "Dispositivo de onde digitalizar"
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
 msgstr "Dispositivo SANE para obter imagens"
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
-msgstr "VERDADE se a janela da aplicação está maximizada."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "Tipo do documento a ser digitalizado"
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
-"A direcção do digitalizador através da página digitalizada pode ser uma das "
-"seguintes: 'de cima para baixo' 'de baixo para cima' 'esquerda para direita' "
-"'direita para esquerda'"
+"Tipo de documento a ser digitalizado. Esta configuração decide sobre a "
+"resolução de digitalização, cores e pós-processamento."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "Direcção da digitalização"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "A direção do scanner através da página digitalizada."
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "Largura da imagem digitalizada em pixels"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
 msgstr ""
-"O directório no qual salvar os ficheiros. Usa o directório de documentos "
-"predefinido se não for configurado."
+"A largura da imagem digitalizada em pixels. Este valor é actualizado com o "
+"valor da última imagem que foi digitalizada."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "Altura da imagem digitalizada em pixeis"
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
@@ -334,245 +355,248 @@ msgstr ""
 "A altura da imagem digitalizada em pixels. Este valor é actualizado com o "
 "valor da última página digitalizada."
 
-#: ../data/simple-scan.schemas.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "Largura do papel em milímetros"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
-"A altura do papel em milímetros (ou 0 para detecção automática de papel)."
+"A largura do papel em milimetros (ou 0 para detecção automática de papel)."
 
-#: ../data/simple-scan.schemas.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "Altura da folha em décimos de mm"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
 msgstr ""
-"O lado da página para digitalizar. Pode ser uma das seguintes: 'ambas' "
-"'frente' 'verso'"
+"A altura do papel em milímetros (ou 0 para detecção automática de papel)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr "Brilho da digitalização"
 
-#: ../data/simple-scan.schemas.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "O ajuste do brilho desde -100 a 100 (0 sendo nenhum)"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr "Contraste da digitalização"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "O ajuste do contraste desde -100 a 100 (0 sendo nada)"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "Resolução da última imagem digitalizada"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
 msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr ""
 "A resolução em pontos-por-polegada da imagem anteriormente digitalizada."
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-"A resolução em pontos-por-polegadas  a ser usada quando digitalizar fotos."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "Resolução para digitalização de textos"
 
-#: ../data/simple-scan.schemas.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 "A resolução em pontos-por-polegada a ser usada quando digitalizar texto."
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"A largura da imagem digitalizada em pixels. Este valor é actualizado com o "
-"valor da última imagem que foi digitalizada."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "Resolução para digitalização de fotos"
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
-"A largura do papel em milimetros (ou 0 para detecção automática de papel)."
+"A resolução em pontos-por-polegadas  a ser usada quando digitalizar fotos."
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
-msgstr "Tipo do documento a ser digitalizado"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "Lado da página a digitalizar"
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
-msgstr ""
-"Tipo de documento a ser digitalizado. 'texto' para documentos de texto, "
-"'foto' para fotos. Este ajuste define a resolução de digitalização, cores e "
-"pós-processamento."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "O lado da página para digitalizar."
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
-msgstr "Largura do papel em milímetros"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "Pasta para guardar os ficheiros"
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
-msgstr "Largura da imagem digitalizada em pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"O directório no qual salvar os ficheiros. Usa o directório de documentos "
+"predefinido se não for configurado."
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
-msgstr "Altura da janela em pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr "Valor de qualidade a usar na compressão JPEG"
 
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
-msgstr "Largura da janela em pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr "Valor de qualidade a usar na compressão JPEG."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Nenhum digitalizador disponível. Por favor, ligue um scanner."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
 msgstr "Impossível ligar ao scanner"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
 msgstr "Não é possível iniciar a digitalização"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
 msgstr "Erro de comunicação com scanner"
 
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Mostrar a versão de lançamento"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Imprimir mensagens de depuração"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+"Compatibilizar ficheiros PDF gerados por versões mais antigas do Simple Scan"
+
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
 msgstr "Falhou ao digitalizar"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
 msgstr "Documento digitalizado"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
-msgstr ""
-"Utilização:\n"
-"  %s [DISPOSITIVO...] - Utilitário de digitalização"
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[DEVICE...] - Utilitário de digitalização"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
+msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
-"Opções de ajuda:\n"
-"  -d, --debug                     Imprime mensagens de depuração\n"
-"  -v, --version                   Mostra a versão do lançamento\n"
-"  -h, --help                      Mostra as opções de ajuda\n"
-"  --help-all                      Mostra todas as opções de ajuda\n"
-"  --help-gtk                      Mostra as opções do GTK+"
-
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
-#, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
-msgstr ""
-"Opções do GTK+:\n"
-"  --class=CLASS                   Classe de programa como usada pelo "
-"gerenciador de janelas\n"
-"  --name=NOME                     Nome do programa como usado pelo "
-"gerenciador de janelas\n"
-"  --screen=SCREEN                 Ecrã X a ser usado\n"
-"  --sync                          Torna as chamadas do X síncronas\n"
-"  --gtk-module=MODULES            Carrega módulos adicionais do GTK+\n"
-"  --g-fatal-warnings              Torna todos os avisos fatais"
+"Execute '%s --help' para consultar uma lista completa das opções de linha de "
+"comando disponíveis."
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "Documento Digitalizado.pdf"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "É necessário utilizador e palavra-passe para aceder a '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
 msgstr "Nenhum scanner detectado"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
 msgstr "Verifique se o seu scanner está conectado e ligado"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr "PDF (documento multi-página)"
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr "JPEG (comprimido)"
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr "PNG (sem perdas)"
-
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
 msgstr "Guardar Como..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
 msgstr "Ficheiros de imagem"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
 msgstr "Todos os ficheiros"
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
 msgstr "Seleccionar _Tipo de ficheiro"
 
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF (documento multi-página)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (comprimido)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (sem perdas)"
+
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
 msgstr "Falhou ao guardar o ficheiro"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Se não guardar, as alteração serão perdidas permanentemente."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
 msgstr "Guardar documento actual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
 msgstr "Descartar Alterações"
 
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "Incapaz de gravar imagem para pré-visualização"
+
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
 msgstr "Não foi possível abrir a aplicação de visualização de imagem"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
 msgstr "Não foi possível abrir o ficheiro da ajuda"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -602,81 +626,204 @@ msgstr ""
 "este programa. Caso contrário, veja <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
-msgstr "Acerca do Simple Scan"
+msgstr "Acerca do Digitalização Simples (Simple Scan)"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
 msgstr "Ferramenta simples para digitalizar documentos"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
+"  Alessio Treglia https://launchpad.net/~quadrispro\n"
 "  Almufadado https://launchpad.net/~almufadado\n"
+"  André Lopes https://launchpad.net/~zipatei\n"
+"  António PT https://launchpad.net/~antoniopt\n"
+"  Carlos Manuel https://launchpad.net/~crolidge\n"
 "  Claudio Novais https://launchpad.net/~claudiocn\n"
+"  Daniel Carvalho https://launchpad.net/~danielcarvalhobt\n"
+"  David Gomes https://launchpad.net/~davidgomes\n"
 "  Diogo Lavareda https://launchpad.net/~diogolavareda\n"
+"  Fernando Carvalho https://launchpad.net/~phaetonkde\n"
+"  Filipe André Pinho https://launchpad.net/~pinhoadas\n"
+"  Flavio https://launchpad.net/~flaviocarpin\n"
+"  Gusrubin https://launchpad.net/~gusrubin\n"
+"  Hélder Portela https://launchpad.net/~helderp666\n"
+"  Jaime Pereira https://launchpad.net/~jaimepereira\n"
+"  Jose Almeida https://launchpad.net/~josealmeida\n"
 "  Luis Pratas https://launchpad.net/~luispratas\n"
+"  Marco Paulo Martins Sousa https://launchpad.net/~marcomsousa\n"
+"  Maria Loureiro https://launchpad.net/~cloureiro\n"
 "  Ricardo Conde https://launchpad.net/~turotulco\n"
+"  Robert Ancell https://launchpad.net/~robert-ancell\n"
+"  Sérgio Faria https://launchpad.net/~sergio91pt\n"
+"  Tiago Carrondo https://launchpad.net/~tcarrondo\n"
 "  Tiago Silva https://launchpad.net/~tiagosilva\n"
-"  sergio91pt https://launchpad.net/~sergio91pt"
+"  joao dourado https://launchpad.net/~sjdourado\n"
+"  styluss https://launchpad.net/~styluss"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
 msgstr "Guardar documento antes de sair?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
 msgstr "Sair SEM Guardar"
 
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (predefinido)"
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#: ../src/ui.vala:1292
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (rascunho)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
-#, c-format
-msgid "%d dpi"
-msgstr "%d ppp"
-
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (alta-resolução)"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
-msgstr "%d dpi (predefinido)"
+msgid "%d dpi"
+msgstr "%d ppp"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
 msgstr "Ficheiros em falta"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
 msgstr "Por favor, verifique a sua instalação"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
 msgstr "Alterar _digitalizador"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
-msgstr "Documento Digitalizado.pdf"
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr "Escurecer"
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr "Clarear"
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr "Menos"
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr "Mais"
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr "Mínimo"
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr "Máximo"
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "A guardar o documento..."
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "A guardar a página %d de %d"
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "Utilização:\n"
+#~ "  %s [DISPOSITIVO...] - Utilitário de digitalização"
+
+#~ msgid ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ msgstr ""
+#~ "A direcção do digitalizador através da página digitalizada pode ser uma das "
+#~ "seguintes: 'de cima para baixo' 'de baixo para cima' 'esquerda para direita' "
+#~ "'direita para esquerda'"
+
+#~ msgid ""
+#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ msgstr ""
+#~ "O lado da página para digitalizar. Pode ser uma das seguintes: 'ambas' "
+#~ "'frente' 'verso'"
+
+#~ msgid ""
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
+#~ msgstr ""
+#~ "Tipo de documento a ser digitalizado. 'texto' para documentos de texto, "
+#~ "'foto' para fotos. Este ajuste define a resolução de digitalização, cores e "
+#~ "pós-processamento."
+
+#, c-format
+#~ msgid ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+#~ msgstr ""
+#~ "Opções de ajuda:\n"
+#~ "  -d, --debug                     Imprime mensagens de depuração\n"
+#~ "  -v, --version                   Mostra a versão do lançamento\n"
+#~ "  -h, --help                      Mostra as opções de ajuda\n"
+#~ "  --help-all                      Mostra todas as opções de ajuda\n"
+#~ "  --help-gtk                      Mostra as opções do GTK+"
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "Opções GTK+:\n"
+#~ "--class=CLASS          Classe do Programa tal como usado pelo gestor de "
+#~ "janelas\n"
+#~ "--name=NAME            Nome do Programa tal como usado pelo gestor de "
+#~ "janelas\n"
+#~ "--screen=SCREEN        Ecrã X a ser usado\n"
+#~ "--sync                 Fazer a chamadas ao ecrã X sincronas\n"
+#~ "--gtk-module=MODULES   Carregar módulos GTK+ adicionais\n"
+#~ "--g-fatal-warnings     Tornar todos os avisos fatais"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0714b94..add4dbe 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,326 +7,347 @@ msgid ""
 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-11-10 23:59+0000\n"
-"Last-Translator: André Gondim <andregondim@ubuntu.com>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2013-04-16 12:21+0000\n"
+"Last-Translator: Neliton Pereira Jr. <nelitonpjr@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@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-11-12 04:58+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Digitalizador simples"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr "A_4"
+msgid "_Document"
+msgstr "_Documento"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr "Digit_alizar"
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "_Página única"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:10
 msgid "All Pages From _Feeder"
 msgstr "Todas as páginas do ali_mentador"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr "Verso"
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
-msgstr "Recortar"
+msgid "_Stop Scan"
+msgstr "Par_ar digitalização"
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr "Recortar a página selecionada"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr "Frente"
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr "Frente e Verso"
-
-#. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr "Ofício"
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr "Novo"
-
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr "Tamanho da página:"
+msgid "Text"
+msgstr "Texto"
 
 #. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
+#: ../data/simple-scan.ui.h:16
 msgid "Photo"
 msgstr "Foto"
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr "Preferências"
-
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
-msgstr "Girar à esquerda"
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr "_E-mail"
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr "Girar à direita"
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr "_Página"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
+#: ../data/simple-scan.ui.h:22
 msgid "Rotate _Left"
 msgstr "Girar à _esquerda"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
+#: ../data/simple-scan.ui.h:24
 msgid "Rotate _Right"
-msgstr "Girar à direita"
+msgstr "Girar à di_reita"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Girar a página à esquerda (sentido anti-horário)"
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "Re_cortar"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Girar a página à direita (sentido horário)"
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "_Nenhum"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
 
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "_Carta"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "_Ofício"
+
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr "Salvar"
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr "Salvar documento em arquivo"
+msgid "_Custom"
+msgstr "_Personalizar"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr "Digit_alizar"
+msgid "_Rotate Crop"
+msgstr "Gira_r área recortada"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
-msgstr "Digitalizar"
+msgid "Move Left"
+msgstr "Mover para a esquerda"
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr "Origem do digitalizad_or:"
+msgid "Move Right"
+msgstr "Mover para a direita"
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr "Digitalizar lado:"
+msgid "_Help"
+msgstr "A_juda"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
-msgstr "Digitalizar uma página no digitalizador"
-
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr "Digitalizador Simples"
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr "_Página única"
+msgid "_Contents"
+msgstr "_Conteúdo"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
 msgstr "Iniciar um novo documento"
 
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "Novo"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "Digitalizar uma página no digitalizador"
+
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
-msgstr "Parar"
+msgid "Scan"
+msgstr "Digitalizar"
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr "Salvar documento em arquivo"
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "Salvar"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
 msgid "Stop the current scan"
 msgstr "Parar a digitalização atual"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr "Texto"
-
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr "_Autorizar"
+msgid "Stop"
+msgstr "Parar"
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
-msgstr "_Conteúdos"
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Girar a página à esquerda (sentido anti-horário)"
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr "Re_cortar"
+msgid "Rotate Left"
+msgstr "Girar à esquerda"
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr "_Personalizar"
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Girar a página à direita (sentido horário)"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr "_Documento"
+msgid "Rotate Right"
+msgstr "Girar à direita"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "Recortar a página selecionada"
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
-msgstr "_E-mail"
+msgid "Crop"
+msgstr "Recortar"
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr "A_juda"
+msgid "_Username for resource:"
+msgstr "Nome de _usuário para o recurso:"
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr "_Carta"
+msgid "_Password:"
+msgstr "_Senha:"
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr "_Nenhum"
+msgid "_Authorize"
+msgstr "_Autorizar"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr "_Página"
+msgid "Preferences"
+msgstr "Preferências"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr "_Senha:"
+msgid "Scan S_ource:"
+msgstr "Origem da digitalizaçã_o:"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
-msgstr "Resolução da _foto:"
+msgid "_Text Resolution:"
+msgstr "Resolução do _texto:"
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr "Gira_r área recortada"
+msgid "_Photo Resolution:"
+msgstr "Resolução da _foto:"
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
-msgstr "Par_ar digitalização"
+msgid "Scan Side:"
+msgstr "Lado a digitalizar:"
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
-msgstr "Resolução do _texto:"
+msgid "Page Size:"
+msgstr "Tamanho da página:"
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
-msgstr "Nome de _usuário para o recurso:"
+msgid "Brightness:"
+msgstr "Brilho:"
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
-msgstr "Digitalizar documentos"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr "Contraste:"
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
-msgstr "Dispositivo de onde digitalizar"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr "Qualidade:"
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
-msgstr "Direção da digitalização"
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "Frente e verso"
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
-msgstr "Diretório no qual salvar arquivos"
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "Frente"
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
-msgstr "Altura do papel em décimos de milímetro"
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "Verso"
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr "Altura da imagem digitalizada em pixels"
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "Digitalizar documentos"
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
-msgstr "Lado da página para digitalizar"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "Largura da janela em pixels"
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
-msgstr "Resolução para digitalização de fotos"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "Altura da janela em pixels"
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
-msgstr "Resolução para digitalização de textos"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "VERDADEIRO se a janela do aplicativo estiver maximizada"
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
-msgstr "Resolução da última imagem digitalizada"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "Dispositivo de onde digitalizar"
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
-msgstr "Dispositivo para o SANE adquirir imagens."
+msgstr "Dispositivo de onde o SANE adquirire imagens."
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
-msgstr "VERDADEIRO se a janela do aplicativo está maximizada"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "Tipo do documento a ser digitalizado"
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
-"A direção do digitalizador através da página digitalizada pode ser uma das "
-"seguintes: 'de cima para baixo' 'de baixo para cima' 'esquerda para direita' "
-"'direita para esquerda'"
+"Tipo de documento a ser digitalizado. Esta configuração define a resolução "
+"da digitalização, cores e pós-processamento."
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "Direção da digitalização"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "A direção em que o digitalizador percorre a página digitalizada."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "Largura da imagem digitalizada em pixels"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
 msgstr ""
-"O diretório no qual salvar os arquivos. Se não for configurado usa o "
-"diretório de documentos padrão."
+"A largura da imagem digitalizada em pixels. Este valor é atualizado com o "
+"valor da última imagem que foi digitalizada."
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "Altura da imagem digitalizada em pixels"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
@@ -334,7 +355,22 @@ msgstr ""
 "A altura da imagem digitalizada em pixels. Este valor é atualizado com o "
 "valor da última página digitalizada."
 
-#: ../data/simple-scan.schemas.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "Largura do papel em décimos de milímetro"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"A largura do papel em décimos de mm (ou 0 para detecção automática de papel)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "Altura do papel em décimos de milímetro"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -342,239 +378,227 @@ msgstr ""
 "A altura do papel em décimos de milímetro (ou 0 para detecção automática de "
 "papel)."
 
-#: ../data/simple-scan.schemas.in.h:16
-msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
-msgstr ""
-"O lado da página para digitalizar. Pode ser uma das seguintes: 'ambas' "
-"'frente' 'verso'"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr "Luminosidade do digitalizador"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "O ajuste de luminosidade de -100 para 100 (0 sendo nenhum)"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr "Contraste do digitalizador"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "O ajuste do contraste de -100 para 100 (0 sendo nenhum)"
 
-#: ../data/simple-scan.schemas.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "Resolução da última imagem digitalizada"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
 msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr ""
 "A resolução em pontos por polegada da imagem previamente digitalizada."
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-"A resolução em pontos por polegadas para usar quando digitalizar fotos."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "Resolução para digitalização de textos"
 
-#: ../data/simple-scan.schemas.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
-"A resolução em pontos por polegada para usar quando digitalizar texto."
+"A resolução em pontos por polegada a ser usada na digitalização e textos."
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"A largura da imagem digitalizada em pixels. Este valor é atualizado com o "
-"valor da última imagem que foi digitalizada."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "Resolução para digitalização de fotos"
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
-"A largura do papel em décimos de mm (ou 0 para detecção automática de papel)."
+"A resolução em pontos por polegadas a ser usada na digitalização de fotos."
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
-msgstr "Tipo do documento sendo digitalizado"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "Lado da página a ser digitalizado"
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
-msgstr ""
-"Tipo de documento sendo digitalizado. 'texto' para documentos de texto, "
-"'foto' para fotos. Este ajuste define a resolução de digitalização, cores e "
-"pós-processamento."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "O lado da página a ser digitalizado."
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
-msgstr "Largura do papel em décimos de milímetro"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "Diretório para salvar arquivos"
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
-msgstr "Largura da imagem digitalizada em pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"O diretório no qual salvar os arquivos. Se não configurado, o diretório "
+"Documentos é usado como padrão."
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
-msgstr "Altura da janela em pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr "Qualidade para usar na compressão JPEG"
 
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
-msgstr "Largura da janela em pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr "Qualidade para usar na compressão JPEG."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
-"Sem digitalizadores disponíveis. Por favor, conecte um digitalizador."
+"Nenhum digitalizador disponível. Por favor, conecte um digitalizador."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
-msgstr "Não foi possível conectar ao digitalizador"
+msgstr "Não foi possível conectar-se ao digitalizador"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
 msgstr "Não foi possível iniciar o digitalizador"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
-msgstr "Erro ao comunicar com o digitalizador"
+msgstr "Erro na comunicação com o digitalizador"
+
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Mostrar versão de lançamento"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Imprimir mensagens de depuração"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+"Corrigir arquivos PDF gerados com versões anteriores do Digitalizador simples"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
 msgstr "Falha ao digitalizar"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
 msgstr "Documento digitalizado"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
-msgstr ""
-"Uso:\n"
-"  %s [DISPOSITIVO...] - Utilitário de escaneamento"
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[DISPOSITIVO...] - Utilitário de digitalização"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
+msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
-"Opções de ajuda:\n"
-"  -d, --debug                     Imprime mensagens de depuração\n"
-"  -v, --version                   Mostra a versão do lançamento\n"
-"  -h, --help                      Mostra as opções de ajuda\n"
-"  --help-all                      Mostra todas as opções de ajuda\n"
-"  --help-gtk                      Mostra as opções do GTK+"
-
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
-#, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
-msgstr ""
-"Opções do GTK+:\n"
-"  --class=CLASS                   Classe de programa como usada pelo "
-"gerenciador de janelas\n"
-"  --name=NAME                     Nome do programa como usado pelo "
-"gerenciador de janelas\n"
-"  --screen=SCREEN                 Tela X a ser usada\n"
-"  --sync                          Torna as chamadas do X síncronas\n"
-"  --gtk-module=MODULES            Carrega módulos adicionais do GTK+\n"
-"  --g-fatal-warnings              Torna todos os avisos fatais"
+"Execute '%s --help' para ver a lista completa de opções disponíveis para "
+"linha de comando."
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "Documento digitalizado.pdf"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "É necessário o nome de usuário e senha para acessar '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
 msgstr "Nenhum digitalizador detectado"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
 msgstr "Por favor verifique se o seu digitalizador está conectado e ligado"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr "PDF (documento multiplas páginas)"
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr "JPEG (comprimido)"
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr "PNG (sem perdas)"
-
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
 msgstr "Salvar como..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
 msgstr "Arquivos de imagem"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
 msgstr "Todos os arquivos"
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
 msgstr "Selecionar _tipo de arquivo"
 
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF (documento com múltiplas páginas)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (comprimido)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (sem perdas)"
+
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
 msgstr "Falha ao salvar o arquivo"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
-msgstr "Se você não salvar, alteração serão permanentemente perdidas."
+msgstr "Se você não salvar, as alterações serão permanentemente perdidas."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
 msgstr "Salvar documento atual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
 msgstr "Descartar alterações"
 
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "Não é possível salvar imagem para visualização"
+
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
 msgstr "Não foi possível abrir o aplicativo de visualização de imagem"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
 msgstr "Não foi possível abrir o arquivo de ajuda"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -589,98 +613,211 @@ msgid ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
-"Este programa é software livre: você pode redistribuí-lo e/ou modificá-lo\n"
-"sob os termos da Licença Pública Geral GNU como publicado pela\n"
-"Free Software Foundation, seja a versão 3 da licença,  ou (na sua opinião)\n"
+"Este programa é uma software livre: você pode redistribuí-lo e/ou modificá-"
+"lo\n"
+"sob os termos da Licença Pública Geral GNU conforme publicada pela\n"
+"Free Software Foundation, seja a versão 3 da licença, ou (se preferir)\n"
 "alguma versão posterior.\n"
 "\n"
-"Este programa é distribuído na esperança de que seja útil, mas\n"
-"SEM NENHUMA GARANTIA; mesmo a garantia implicada de COMERCIALIZAÇÃO\n"
-"ou APTIDÃO PARA UMA FINALIDADE PARTICULAR. Veja a Licença Pública\n"
+"Este programa é distribuído na expectativa de que seja útil, mas\n"
+"SEM NENHUMA GARANTIA; nem mesmo a garantia implícita de COMERCIALIZAÇÃO\n"
+"ou ADEQUAÇÃO PARA UMA FINALIDADE EM PARTICULAR. Veja a Licença Pública\n"
 "Geral GNU para mais detalhes.\n"
 "\n"
-"Você deve ter recebido uma cópia da  Licença Pública Geral GNU juntamente a "
-"\n"
-"este programa. Caso contrário, veja <http://www.gnu.org/licenses/>."
+"Você deve ter recebido uma cópia da Licença Pública Geral GNU juntamente a\n"
+"este programa. Caso contrário, acesse <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
-msgstr "Sobre o Digitalizador Simples"
+msgstr "Sobre o Digitalizador simples"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
 msgstr "Ferramenta simples para digitalizar documentos"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Almufadado https://launchpad.net/~almufadado\n"
 "  André Gondim https://launchpad.net/~andregondim\n"
 "  Benjamim Gois https://launchpad.net/~benjamim-gois\n"
+"  Celio Ricardo Quaio Goetten https://launchpad.net/~celioric\n"
 "  Celso H. L. S. Junior https://launchpad.net/~celsojunior\n"
 "  Matheus Pacheco de Andrade https://launchpad.net/~matheusp-andrade\n"
+"  Neliton Pereira Jr. https://launchpad.net/~nelitonpjr\n"
+"  Pablo Diego Moço https://launchpad.net/~pablodm89\n"
+"  Paulo José https://launchpad.net/~pauloup\n"
+"  Paulo Pernomian https://launchpad.net/~paulopernomian\n"
+"  Rafael Neri https://launchpad.net/~rafepel\n"
 "  Rafael Zenni https://launchpad.net/~rafaeldz\n"
+"  Tiago Hillebrandt https://launchpad.net/~tiagohillebrandt\n"
 "  Vitor da Silva Gonçalves https://launchpad.net/~vitorsgoncalves\n"
+"  Vítor Avelino https://launchpad.net/~vitoravelino\n"
 "  andbelo https://launchpad.net/~andbelo\n"
-"  kahue https://launchpad.net/~kahuemm"
+"  kahue https://launchpad.net/~kahuemm\n"
+"  millemiglia https://launchpad.net/~dnieper650"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
-msgstr "Salvar documento antes de sair?"
+msgstr "Salvar o documento antes de sair?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
 msgstr "Sair sem salvar"
 
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (padrão)"
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#: ../src/ui.vala:1292
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (rascunho)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
-#, c-format
-msgid "%d dpi"
-msgstr "%d ppp"
-
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (alta resolução)"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
-msgstr "%d dpi (padrão)"
+msgid "%d dpi"
+msgstr "%d ppp"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
 msgstr "Arquivos faltando"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
 msgstr "Por favor verifique a sua instalação"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
 msgstr "Alterar _digitalizador"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
-msgstr "Digitalizado documento.pdf"
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr "Mais escuro"
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr "Mais claro"
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr "Menos"
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr "Mais"
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr "Mínima"
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr "Máxima"
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "Salvando documento..."
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "Salvando página %d de %d"
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "Opções do GTK+:\n"
+#~ "  --class=CLASS                   Classe de programa como usada pelo "
+#~ "gerenciador de janelas\n"
+#~ "  --name=NAME                     Nome do programa como usado pelo "
+#~ "gerenciador de janelas\n"
+#~ "  --screen=SCREEN                 Tela X a ser usada\n"
+#~ "  --sync                          Torna as chamadas do X síncronas\n"
+#~ "  --gtk-module=MODULES            Carrega módulos adicionais do GTK+\n"
+#~ "  --g-fatal-warnings              Torna todos os avisos fatais"
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "Uso:\n"
+#~ "  %s [DISPOSITIVO...] - Utilitário de escaneamento"
+
+#~ msgid ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ msgstr ""
+#~ "A direção do digitalizador através da página digitalizada pode ser uma das "
+#~ "seguintes: 'de cima para baixo' 'de baixo para cima' 'esquerda para direita' "
+#~ "'direita para esquerda'"
+
+#~ msgid ""
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
+#~ msgstr ""
+#~ "Tipo de documento sendo digitalizado. 'texto' para documentos de texto, "
+#~ "'foto' para fotos. Este ajuste define a resolução de digitalização, cores e "
+#~ "pós-processamento."
+
+#, c-format
+#~ msgid ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+#~ msgstr ""
+#~ "Opções de ajuda:\n"
+#~ "  -d, --debug                     Imprime mensagens de depuração\n"
+#~ "  -v, --version                   Mostra a versão do lançamento\n"
+#~ "  -h, --help                      Mostra as opções de ajuda\n"
+#~ "  --help-all                      Mostra todas as opções de ajuda\n"
+#~ "  --help-gtk                      Mostra as opções do GTK+"
+
+#~ msgid ""
+#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ msgstr ""
+#~ "O lado da página para digitalizar. Pode ser uma das seguintes: 'ambas' "
+#~ "'frente' 'verso'"
diff --git a/po/ro.po b/po/ro.po
index 5a679cb..626737b 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,326 +7,348 @@ msgid ""
 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-08-16 01:57+0000\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-09-11 18:43+0000\n"
 "Last-Translator: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-22 04:48+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 "Language: ro\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Scanare simplă"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr "A_4"
+msgid "_Document"
+msgstr "_Document"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr "Sc_anează"
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "O singură _pagină"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:10
 msgid "All Pages From _Feeder"
 msgstr "Toate paginile de la tava cu _foi de hârtie"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr "Verso"
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
-msgstr "Decupează"
+msgid "_Stop Scan"
+msgstr "Oprește _scanarea"
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr "Decupează pagina selectată"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr "Față"
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr "Față și verso"
-
-#. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr "Le_gal"
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr "Nou"
-
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr "Dimensiunea paginii:"
+msgid "Text"
+msgstr "Text"
 
 #. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
+#: ../data/simple-scan.ui.h:16
 msgid "Photo"
 msgstr "Foto"
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr "Preferințe"
-
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
-msgstr "Rotește la stânga"
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr "_Email"
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr "Rotește la dreapta"
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr "_Pagină"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
+#: ../data/simple-scan.ui.h:22
 msgid "Rotate _Left"
 msgstr "Rotește la _stânga"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
+#: ../data/simple-scan.ui.h:24
 msgid "Rotate _Right"
 msgstr "Rotește la _dreapta"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Rotește pagina la stânga (în sens invers acelor de ceasornic)"
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "De_cupează"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Rotește pagina la dreapta (în sensul acelor de ceasornic)"
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "_Niciunul"
 
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "_Scrisoare"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "Le_gal"
+
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr "Salvează"
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr "Salvează documentul ca fișier"
+msgid "_Custom"
+msgstr "_Personalizat"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr "Sc_anează"
+msgid "_Rotate Crop"
+msgstr "_Rotește zona decupată"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
-msgstr "Scanează"
+msgid "Move Left"
+msgstr "Mută la stânga"
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr "S_ursă scanare:"
+msgid "Move Right"
+msgstr "Mută la dreapta"
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr "Partea scanată:"
+msgid "_Help"
+msgstr "_Ajutor"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
-msgstr "Scanați o singură pagină din scaner"
-
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr "Scanare simplă"
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr "O singură _pagină"
+msgid "_Contents"
+msgstr "_Cuprins"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
 msgstr "Începeți un document nou"
 
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "Nou"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "Scanați o singură pagină din scaner"
+
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
-msgstr "Oprește"
+msgid "Scan"
+msgstr "Scanează"
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr "Salvează documentul ca fișier"
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "Salvează"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
 msgid "Stop the current scan"
 msgstr "Oprește scanarea curentă"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr "Text"
-
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr "_Autorizează"
+msgid "Stop"
+msgstr "Oprește"
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
-msgstr "_Cuprins"
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Rotește pagina la stânga (în sens invers acelor de ceasornic)"
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr "De_cupează"
+msgid "Rotate Left"
+msgstr "Rotește la stânga"
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr "_Personalizat"
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Rotește pagina la dreapta (în sensul acelor de ceasornic)"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr "_Document"
+msgid "Rotate Right"
+msgstr "Rotește la dreapta"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "Decupează pagina selectată"
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
-msgstr "_Email"
+msgid "Crop"
+msgstr "Decupează"
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr "_Ajutor"
+msgid "_Username for resource:"
+msgstr "Numele de _utilizator pentru resursă:"
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr "_Scrisoare"
+msgid "_Password:"
+msgstr "_Parolă:"
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr "_Niciunul"
+msgid "_Authorize"
+msgstr "_Autorizează"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr "_Pagină"
+msgid "Preferences"
+msgstr "Preferințe"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr "_Parolă:"
+msgid "Scan S_ource:"
+msgstr "S_ursă scanare:"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
-msgstr "Rezoluție _foto :"
+msgid "_Text Resolution:"
+msgstr "Rezoluție _text:"
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr "_Rotește zona decupată"
+msgid "_Photo Resolution:"
+msgstr "Rezoluție _foto :"
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
-msgstr "Oprește _scanarea"
+msgid "Scan Side:"
+msgstr "Partea scanată:"
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
-msgstr "Rezoluție _text:"
+msgid "Page Size:"
+msgstr "Dimensiunea paginii:"
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
-msgstr "Numele de _utilizator pentru resursă:"
+msgid "Brightness:"
+msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
-msgstr "Scanează documente"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
-msgstr "Dispozitiv de folosit pentru scanare"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
-msgstr "Direcția scanării"
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "Față și verso"
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
-msgstr "Dosarul în care să se salveze fișierele"
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "Față"
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
-msgstr "Înălțimea hârtiei în zecimi de mm"
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "Verso"
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr "Înălțimea imaginii scanate, în pixeli"
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "Scanează documente"
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
-msgstr "Partea de scanat a paginii"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "Lățimea ferestrei, în pixeli"
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
-msgstr "Rezoluția pentru scanări foto"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "Înălțimea ferestrei, în pixeli"
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
-msgstr "Rezoluția pentru scanări text"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "ADEVĂRAT dacă fereastra aplicației este mărită la maximum"
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
-msgstr "Rezoluția ultimei imagini scanate"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "Dispozitiv de folosit pentru scanare"
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
 msgstr "Dispozitivul SANE din care se preiau imaginile."
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
-msgstr "ADEVĂRAT dacă fereastra aplicației este mărită la maximum"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "Tipul de document scanat"
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
-"Direcția scanerului peste pagina scanată. Poate fi una dintre următoarele: "
-"„top-to-bottom”, „bottom-to-top”, „left-to-right”, „right-to-left”"
+"Tipul de document care va fi scanat. Această opțiune determină rezoluția de "
+"scanare, culoarea și post-procesarea."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "Direcția scanării"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "Direcția scanerului față de pagina scanată."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "Lățimea imaginii scanate, în pixeli"
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
 msgstr ""
-"Dosarul în care să se salveze fișierele. Dacă nu este definit, fișierele "
-"sunt salvate în dosarul de documente."
+"Lățimea imaginii scanate, în pixeli. Această valoare este actualizată la cea "
+"corespunzătoare paginii scanate precedent."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "Înălțimea imaginii scanate, în pixeli"
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
@@ -334,7 +356,22 @@ msgstr ""
 "Înălțimea imaginii scanate, în pixeli. Această valoare este actualizată la "
 "cea corespunzătoare paginii scanate precedent."
 
-#: ../data/simple-scan.schemas.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "Lățimea hârtiei în zecimi de mm"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Lățimea hârtiei în zecimi de mm (sau 0 pentru detectarea automată a hârtiei)"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "Înălțimea hârtiei în zecimi de mm"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -342,235 +379,224 @@ msgstr ""
 "Înălțimea hârtiei în zecimi de mm (sau 0 pentru detectarea automată a "
 "hârtiei)"
 
-#: ../data/simple-scan.schemas.in.h:16
-msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
-"Partea de scanat a paginii. Poate fi una din următoarele: „ambele”, „față”, "
-"„verso”"
 
-#: ../data/simple-scan.schemas.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "Rezoluția ultimei imagini scanate"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
 msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr "Rezoluția în dpi (dots-per-inch) a imaginii scanate precedent."
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "Rezoluția în dpi (dots-per-inch) folosită la scanarea fotografiilor."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "Rezoluția pentru scanări text"
 
-#: ../data/simple-scan.schemas.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "Rezoluția în dpi (dots-per-inch) folosită la scanarea de text."
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"Lățimea imaginii scanate, în pixeli. Această valoare este actualizată la cea "
-"corespunzătoare paginii scanate precedent."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "Rezoluția pentru scanări foto"
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Lățimea hârtiei în zecimi de mm (sau 0 pentru detectarea automată a hârtiei)"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "Rezoluția în dpi (dots-per-inch) folosită la scanarea fotografiilor."
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
-msgstr "Tipul de document scanat"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "Partea de scanat a paginii"
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
-msgstr ""
-"Tipul de document scanat. „text” pentru documentele în format text, „photo” "
-"pentru fotografii. Aceste configurări decid rezoluția, culorile și post-"
-"procesarea scanării."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "Fața paginii care va fi scanată."
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
-msgstr "Lățimea hârtiei în zecimi de mm"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "Dosarul în care să se salveze fișierele"
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
-msgstr "Lățimea imaginii scanate, în pixeli"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Dosarul în care să se salveze fișierele. Dacă nu este definit, fișierele "
+"sunt salvate în dosarul de documente."
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
-msgstr "Înălțimea ferestrei, în pixeli"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
-msgstr "Lățimea ferestrei, în pixeli"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Nu există niciun scaner disponibil. Conectați un scaner."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
 msgstr "Nu s-a putut realiza conexiunea la scaner"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
 msgstr "Nu s-a putut porni scanarea"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
 msgstr "Eroare la comunicarea cu scanerul"
 
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Arată versiunea"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Afișează mesajele pentru depanare"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+"Repară fișiere PDF generate cu versiuni mai vechi ale programului scanare "
+"simplă"
+
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
 msgstr "Scanarea a eșuat"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
 msgstr "Document scanat"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
-msgstr ""
-"Utilizare:\n"
-"  %s [DISPOZITIV...] - Utilitar de scanare"
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "DISPOZITIV...] - Utilitar pentru scanare"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
-#, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
-msgstr ""
-"Opțiuni de ajutor:\n"
-"  -d, --debug                     Tipărește mesajele de depanare\n"
-"  -v, --version                   Afișează versiunea lansată\n"
-"  -h, --help                      Afișează opțiuni de ajutor\n"
-"  --help-all                      Afișează toate opțiunile de ajutor\n"
-"  --help-gtk                      Afișează opțiuni GTK+"
-
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
+msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
-"Opțiuni GTK+:\n"
-"  --class=CLASĂ                   Clasa de program folosită de "
-"administratorul de ferestre\n"
-"  --name=NUME                     Nume program folosit de administratorul de "
-"ferestre\n"
-"  --screen=ECRAN                  Ecranul X folosit\n"
-"  --sync                          Efectuează X apeluri sincrone\n"
-"  --gtk-module=MODULE             Încarcă module GTK+ adiționale\n"
-"  --g-fatal-warnings              Consideră toate avertismentele fatale"
+"Rulați „%s --help” pentru a consulta lista completă a opțiunilor pentru "
+"comenzile mediului text."
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "Document scanat.pdf"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Sunt necesare numele de utilizator și parola pentru a accesa „%s”"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
 msgstr "Nu a fost detectat niciun scaner"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
 msgstr "Verificați dacă scanerul este conectat și pornit"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr "PDF (document cu mai multe pagini)"
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr "JPEG (comprimat)"
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr "PNG (fără pierderi)"
-
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
 msgstr "Salvează ca..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
 msgstr "Fișiere imagine"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
 msgstr "Toate fișierele"
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
 msgstr "Alegeți _tipul de fișier"
 
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF (document cu mai multe pagini)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (comprimat)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (fără pierderi)"
+
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
 msgstr "Salvarea fișierului a eșuat"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Dacă nu salvați, modificările vor fi pierdute definitiv."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
 msgstr "Salvați documentul curent?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
 msgstr "Renunță la modificări"
 
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "Nu se poate salva imaginea pentru a prezenta o previzualizare"
+
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
 msgstr "Nu s-a putut deschide aplicația de previzualizare a imaginilor"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
 msgstr "Nu se poate deschide fișierul de ajutor"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -602,79 +628,184 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
 msgstr "Despre „Scanare simplă”"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
 msgstr "Utilitar pentru scanarea simplă a documentelor"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Adi Roiban https://launchpad.net/~adiroiban\n"
+"  Claudia Cotună https://launchpad.net/~special4ti\n"
 "  Dan Telecan https://launchpad.net/~telecan-dan\n"
 "  Lucian Adrian Grijincu https://launchpad.net/~lucian.grijincu\n"
+"  Marian Vasile https://launchpad.net/~marianvasile-ubuntu\n"
 "  ValentinV https://launchpad.net/~valentinverde\n"
 "  sfantu https://launchpad.net/~sfantus1"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
 msgstr "Salvați documentul înainte de ieșire?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
 msgstr "Închide fără a salva"
 
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (implicit)"
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#: ../src/ui.vala:1292
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (ciornă)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
-#, c-format
-msgid "%d dpi"
-msgstr "%d dpi"
-
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (rezoluție înaltă)"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
-msgstr "%d dpi (implicit)"
+msgid "%d dpi"
+msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
-msgstr "Lipsesc fișiere"
+msgstr "Lipsesc fișierele"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
 msgstr "Verificați instalarea"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
 msgstr "Schimbă _scanerul"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
 msgstr "Automată"
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
-msgstr "Document scanat.pdf"
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr ""
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr ""
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr ""
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr ""
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr ""
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr ""
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr ""
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr ""
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "Utilizare:\n"
+#~ "  %s [DISPOZITIV...] - Utilitar de scanare"
+
+#~ msgid ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ msgstr ""
+#~ "Direcția scanerului peste pagina scanată. Poate fi una dintre următoarele: "
+#~ "„top-to-bottom”, „bottom-to-top”, „left-to-right”, „right-to-left”"
+
+#~ msgid ""
+#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ msgstr ""
+#~ "Partea de scanat a paginii. Poate fi una din următoarele: „ambele”, „față”, "
+#~ "„verso”"
+
+#~ msgid ""
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
+#~ msgstr ""
+#~ "Tipul de document scanat. „text” pentru documentele în format text, „photo” "
+#~ "pentru fotografii. Aceste configurări decid rezoluția, culorile și post-"
+#~ "procesarea scanării."
+
+#, c-format
+#~ msgid ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+#~ msgstr ""
+#~ "Opțiuni de ajutor:\n"
+#~ "  -d, --debug                     Tipărește mesajele de depanare\n"
+#~ "  -v, --version                   Afișează versiunea lansată\n"
+#~ "  -h, --help                      Afișează opțiuni de ajutor\n"
+#~ "  --help-all                      Afișează toate opțiunile de ajutor\n"
+#~ "  --help-gtk                      Afișează opțiuni GTK+"
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "Opțiuni GTK+:\n"
+#~ "  --class=CLASĂ                   Clasa de program folosită de "
+#~ "administratorul de ferestre\n"
+#~ "  --name=NUME                     Nume program folosit de administratorul de "
+#~ "ferestre\n"
+#~ "  --screen=ECRAN                  Ecranul X folosit\n"
+#~ "  --sync                          Efectuează X apeluri sincrone\n"
+#~ "  --gtk-module=MODULE             Încarcă module GTK+ adiționale\n"
+#~ "  --g-fatal-warnings              Consideră toate avertismentele fatale"
diff --git a/po/ru.po b/po/ru.po
index 99c612a..2cf47ef 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,324 +7,347 @@ msgid ""
 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-27 13:20+0000\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-07-23 09:07+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-10-22 04:48+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Простое сканирование"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr "A_4"
+msgid "_Document"
+msgstr "_Документ"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr "От_сканировать"
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "Одна _страница"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:10
 msgid "All Pages From _Feeder"
 msgstr "Все страницы из _автоподатчика"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr "Обратная сторона"
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
-msgstr "Обрезать"
+msgid "_Stop Scan"
+msgstr "_Остановить сканирование"
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr "Обрезать выбранную страницу"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr "Лицевая сторона"
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr "Обе стороны"
-
-#. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr "US Le_gal"
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr "Создать"
-
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr "Размер листа"
+msgid "Text"
+msgstr "Текст"
 
 #. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
+#: ../data/simple-scan.ui.h:16
 msgid "Photo"
 msgstr "Фотография"
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr "Параметры"
-
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
-msgstr "Повернуть влево"
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr "Отправить по _электронной почте"
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr "Повернуть вправо"
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr "_Страница"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
+#: ../data/simple-scan.ui.h:22
 msgid "Rotate _Left"
 msgstr "Повернуть в_лево"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
+#: ../data/simple-scan.ui.h:24
 msgid "Rotate _Right"
 msgstr "Повернуть в_право"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Повернуть страницу влево (против часовой стрелки)"
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "_Обрезать"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Повернуть страницу вправо (по часовой стрелке)"
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "_Нет"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
 
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "US _Letter"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "US Le_gal"
+
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr "Сохранить"
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr "Сохранить документ в файл"
+msgid "_Custom"
+msgstr "_Другое..."
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr "От_сканировать"
+msgid "_Rotate Crop"
+msgstr "_Повернуть выбранное"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
-msgstr "Отсканировать"
+msgid "Move Left"
+msgstr ""
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr "Ист_очник сканирования"
+msgid "Move Right"
+msgstr ""
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr "Сканируемая сторона:"
+msgid "_Help"
+msgstr "_Справка"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
-msgstr "Отсканировать одну страницу со сканера"
-
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr "Simple Scan"
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr "Одна _Страница"
+msgid "_Contents"
+msgstr "_Содержание"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
 msgstr "Создать новый документ"
 
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "Создать"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "Отсканировать одну страницу со сканера"
+
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
-msgstr "Прервать"
+msgid "Scan"
+msgstr "Отсканировать"
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr "Сохранить документ в файл"
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "Сохранить"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
 msgid "Stop the current scan"
 msgstr "Прервать выполняемое сканирование"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr "Текст"
-
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr "Р_азрешить"
+msgid "Stop"
+msgstr "Завершить"
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
-msgstr "_Содержание"
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Повернуть страницу влево (против часовой стрелки)"
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr "_Обрезать"
+msgid "Rotate Left"
+msgstr "Повернуть влево"
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr "_Нестандартный"
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Повернуть страницу вправо (по часовой стрелке)"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr "_Документ"
+msgid "Rotate Right"
+msgstr "Повернуть вправо"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "Обрезать выбранную страницу"
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
-msgstr "Отправить _почтой"
+msgid "Crop"
+msgstr "Обрезать"
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr "_Справка"
+msgid "_Username for resource:"
+msgstr "Имя поль_зователя для ресурса:"
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr "US _Letter"
+msgid "_Password:"
+msgstr "_Пароль:"
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr "_Нет"
+msgid "_Authorize"
+msgstr "Р_азрешить"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr "_Страница"
+msgid "Preferences"
+msgstr "Параметры"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr "_Пароль:"
+msgid "Scan S_ource:"
+msgstr "Ист_очник сканирования:"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
-msgstr "_Разрешение фотографии:"
+msgid "_Text Resolution:"
+msgstr "Р_азрешение текста:"
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr "_Повернуть выбранное"
+msgid "_Photo Resolution:"
+msgstr "_Разрешение фотографии:"
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
-msgstr "_Остановить сканирование"
+msgid "Scan Side:"
+msgstr "Сканируемая сторона:"
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
-msgstr "Р_азрешение текста:"
+msgid "Page Size:"
+msgstr "Размер листа:"
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
-msgstr "Имя поль_зователя для ресурса:"
+msgid "Brightness:"
+msgstr "Яркость:"
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
-msgstr "Сканирование документов"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr "Контрастность:"
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
-msgstr "Устройство сканирования"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr "Качество:"
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
-msgstr "Направление сканирования"
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "Обе стороны"
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
-msgstr "Папка для сохранения файлов"
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "Лицевая сторона"
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
-msgstr "Высота бумаги в десятых долях мм"
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "Обратная сторона"
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr "Высота отсканированного изображения в пикселах"
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "Сканирование документов"
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
-msgstr "Сторона страницы для сканирования"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "Ширина окна в пикселах"
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
-msgstr "Разрешение для сканирования фотографий"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "Высота окна в пикселах"
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
-msgstr "Разрешение для сканирования текста"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "TRUE, если окно приложения развёрнуто на весь экран"
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
-msgstr "Разрешение последнего отсканированного изображения"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "Устройство сканирования"
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
 msgstr "Устройство SANE для получения изображений."
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
-msgstr "TRUE, если окно приложения развёрнуто на весь экран"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "Тип сканируемого документа"
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
-"Направление сканирования. Возможны следующие варианты: 'top-to-bottom' "
-"'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Тип сканируемого документа. Эта настройка отвечает за разрешение, глубину "
+"цвета и пост-обработку."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "Направление сканирования"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "Направление сканирования страницы."
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "Ширина отсканированного изображения в пикселах"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
 msgstr ""
-"Папка для сохранения файлов. По умолчанию используется папка с документами."
+"Ширина отсканированного изображения в пикселах. Это значение обновляется при "
+"каждом новом сканировании."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "Высота отсканированного изображения в пикселах"
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
@@ -332,239 +355,240 @@ msgstr ""
 "Высота отсканированного изображения в пикселах. Это значение обновляется при "
 "каждом новом сканировании."
 
-#: ../data/simple-scan.schemas.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "Ширина бумаги, см"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
-msgstr "Высота бумаги в десятках мм (или 0 для автоматического определения)"
+msgstr "Ширина бумаги в десятках мм (или 0 для автоматического определения)"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "Высота бумаги в десятых долях мм"
 
-#: ../data/simple-scan.schemas.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
-msgstr ""
-"Сторона страницы для сканирования. Может быть: 'с обоих сторон', 'лицевая', "
-"'обратная'"
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr "Высота бумаги в десятках мм (или 0 для автоматического определения)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr "Яркость изображения"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Значение яркости от -100 до 100 (0 — без изменений)."
 
-#: ../data/simple-scan.schemas.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr "Контрастность изображения"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Значение контрастности от -100 до 100 (0 — без изменений)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "Разрешение последнего отсканированного изображения"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
 msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr ""
 "Разрешение в точках на дюйм предыдущего отсканированного изображения."
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "Разрешение в точках на дюйм при сканировании фотографий."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "Разрешение для сканирования текста"
 
-#: ../data/simple-scan.schemas.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "Разрешение в точках на дюйм при сканировании текста."
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"Ширина отсканированного изображения в пикселах. Это значение обновляется при "
-"каждом новом сканировании."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "Разрешение для сканирования фотографий"
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr "Ширина бумаги в десятках мм (или 0 для автоматического определения)"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "Разрешение в точках на дюйм при сканировании фотографий."
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
-msgstr "Тип сканируемого документа"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "Сторона страницы для сканирования"
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
-msgstr ""
-"Тип сканируемого документа. 'text' для текстовых документов, 'photo' для "
-"фотографий. Выбор типа определяет разрешение, цвета и пост-обработку при "
-"сканировании."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "Сторона страницы для сканирования."
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
-msgstr "Ширина бумаги, см"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "Папка для сохранения файлов"
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
-msgstr "Ширина отсканированного изображения в пикселах"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Папка для сохранения файлов. По умолчанию используется папка с документами."
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
-msgstr "Высота окна в пикселах"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr "Значение качества, используемого для сжатия JPEG"
 
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
-msgstr "Ширина окна в пикселах"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr "Значение качества, используемого для сжатия JPEG."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Нет доступного сканера. Подключите его."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
 msgstr "Не могу подключиться к сканеру"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
 msgstr "Не могу начать сканирование"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
 msgstr "Ошибка при работе со сканером"
 
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Показать версию"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Показать сообщения отладки"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr "Исправить PDF-файлы, созданные предыдущими версиями Simple Scan"
+
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
 msgstr "Сканирование не удалось"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
 msgstr "Отсканированный документ"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
-msgstr ""
-"Использование:\n"
-"  %s [УСТРОЙСТВО...] - Инструмент для сканирования"
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[DEVICE...] — Устройство сканирования"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
-#, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
-msgstr ""
-"Использование:\n"
-"  -d, --debug выводить отладочные сообщения\n"
-"  -v, --version показать информацию о версии\n"
-"  -h, --help показать эту справку\n"
-"  --help-all показать все ключи справки\n"
-"  --help-gtk показать ключи GTK+"
-
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
-msgstr ""
-"Параметры GTK+:\n"
-"  --class=КЛАСС                   Класс программы в оконном менеджере\n"
-"  --name=НАЗВАНИЕ                 Название программы в оконном менеджере\n"
-"  --screen=ЭКРАН                  Используемый экран X\n"
-"  --sync                          Сделать вызовы X синхронными\n"
-"  --gtk-module=МОДУЛИ             Загрузить дополнительные модули GTK+\n"
-"  --g-fatal-warnings              Сделать все предупреждения фатальными"
+msgid "Run '%s --help' to see a full list of available command line options."
+msgstr "Выполните '%s --help', чтобы вывести полный список доступных опций."
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "Сканированный документ.pdf"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Для доступа к '%s' нужны имя пользователя и пароль"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
 msgstr "Сканеры не обнаружены"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
-msgstr "Пожалуйста, проверьте, что сканер подсоединен и включен"
-
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr "PDF (многостраничный документ)"
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr "JPEG (сжатый)"
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr "PNG (без потерь в качестве)"
+msgstr "Пожалуйста, проверьте, что сканер подсоединён и включен"
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
 msgstr "Сохранить как..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
 msgstr "Файлы изображений"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
 msgstr "Все файлы"
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
 msgstr "Выберите _тип файла"
 
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF (многостраничный документ)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (сжатый)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (без потерь в качестве)"
+
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
 msgstr "Не удалось сохранить файл"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Если не выполнить сохранение, все изменения будут утеряны."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
 msgstr "Сохранить текущий документ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
 msgstr "Отменить изменения"
 
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "Не удалось сохранить изображение для предварительного просмотра"
+
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
 msgstr "Невозможно открыть программу для просмотра изображений"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
 msgstr "Не удалось открыть файл справки"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -593,84 +617,208 @@ msgstr ""
 "пройдите по ссылке: <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
-msgstr "О Simple Scan"
+msgstr "О программе"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
 msgstr "Простой инструмент для сканирования документов"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
+"  Aleksey Kabanov https://launchpad.net/~ak099\n"
 "  Alexander Telenga https://launchpad.net/~telenga\n"
 "  Alexandre Prokoudine https://launchpad.net/~alexandre-prokoudine\n"
 "  Alexey Kotlyarov https://launchpad.net/~koterpillar\n"
-"  Alsvartr https://launchpad.net/~pavel-nazarov\n"
 "  Andrew Sudarikov https://launchpad.net/~andrey-interra\n"
+"  Arsa Chernikov https://launchpad.net/~arsa-chernikov\n"
+"  Artem Popov https://launchpad.net/~artfwo\n"
+"  AsstZD https://launchpad.net/~eskaer-spamsink\n"
 "  Dmitri Konoplev https://launchpad.net/~knoplef\n"
+"  Dmitriy \"Simplehuman\" Fedorov https://launchpad.net/~simplehuman\n"
+"  Dmitry Shachnev https://launchpad.net/~mitya57\n"
+"  Dr Gregory House https://launchpad.net/~greghouse\n"
+"  DronAn[BY] https://launchpad.net/~andyak77\n"
+"  Eugene Marshal https://launchpad.net/~lowrider\n"
+"  Evgeny https://launchpad.net/~evgeny-ig\n"
+"  Igor Zubarev https://launchpad.net/~igor.zubarev\n"
+"  Int https://launchpad.net/~howrudoin\n"
+"  Ivan Bulychev https://launchpad.net/~vanyok\n"
 "  KEIII https://launchpad.net/~cashagent\n"
+"  Net4Hack https://launchpad.net/~networkforhackers\n"
+"  Novichkov Alexander https://launchpad.net/~berkut\n"
 "  Oleg https://launchpad.net/~oleg-devyatilov\n"
 "  Oleg Koptev https://launchpad.net/~koptev-oleg\n"
-"  Артём Попов https://launchpad.net/~artfwo"
+"  Pavel Nazarov https://launchpad.net/~alsvartr\n"
+"  Sergey Loshakov https://launchpad.net/~sergeylo\n"
+"  Sergey Sedov https://launchpad.net/~serg-sedov\n"
+"  Stanislav Bazhenov https://launchpad.net/~stanislav-bajenov\n"
+"  Stas Solovey (stmc) https://launchpad.net/~whats-up\n"
+"  Victor Mireyev https://launchpad.net/~victor-mireyev\n"
+"  Vitaly Zawullon Katraev https://launchpad.net/~zawullon\n"
+"  evilzipik https://launchpad.net/~evilzipik\n"
+"  vasilisc https://launchpad.net/~vasilisc\n"
+"  Илья Калитко https://launchpad.net/~kalitko-ilya007"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
 msgstr "Сохранить документ перед выходом?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
 msgstr "Выйти без сохранения"
 
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (по умолчанию)"
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#: ../src/ui.vala:1292
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (черновик)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
-#, c-format
-msgid "%d dpi"
-msgstr "%d dpi"
-
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (высокое разрешение)"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
-msgstr "%d dpi (по умолчанию)"
+msgid "%d dpi"
+msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
 msgstr "Файлы отсутствуют"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
 msgstr "Пожалуйста, проверьте правильность установки программы"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
 msgstr "Сменить _сканер"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
 msgstr "Выбрать автоматически"
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
-msgstr "Сканированный документ.pdf"
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr "Темнее"
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr "Светлее"
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr "Меньше"
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr "Больше"
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr "Мин."
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr "Макс."
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "Сохранение документа..."
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "Сохранение страницы %d из %d"
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "Использование:\n"
+#~ "  %s [УСТРОЙСТВО...] - Инструмент для сканирования"
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "Параметры GTK+:\n"
+#~ "  --class=КЛАСС                   Класс программы в оконном менеджере\n"
+#~ "  --name=НАЗВАНИЕ                 Название программы в оконном менеджере\n"
+#~ "  --screen=ЭКРАН                  Используемый экран X\n"
+#~ "  --sync                          Сделать вызовы X синхронными\n"
+#~ "  --gtk-module=МОДУЛИ             Загрузить дополнительные модули GTK+\n"
+#~ "  --g-fatal-warnings              Сделать все предупреждения фатальными"
+
+#~ msgid ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ msgstr ""
+#~ "Направление сканирования. Возможны следующие варианты: 'top-to-bottom' "
+#~ "'bottom-to-top' 'left-to-right' 'right-to-left'"
+
+#, c-format
+#~ msgid ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+#~ msgstr ""
+#~ "Использование:\n"
+#~ "  -d, --debug выводить отладочные сообщения\n"
+#~ "  -v, --version показать информацию о версии\n"
+#~ "  -h, --help показать эту справку\n"
+#~ "  --help-all показать все ключи справки\n"
+#~ "  --help-gtk показать ключи GTK+"
+
+#~ msgid ""
+#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ msgstr ""
+#~ "Сторона страницы для сканирования. Может быть: 'с обоих сторон', 'лицевая', "
+#~ "'обратная'"
+
+#~ msgid ""
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
+#~ msgstr ""
+#~ "Тип сканируемого документа. 'Текст' для текстовых документов, 'Фотография' "
+#~ "для фотографий. Выбор типа определяет разрешение, цвета и пост-обработку при "
+#~ "сканировании."
diff --git a/po/sd.po b/po/sd.po
new file mode 100644
index 0000000..03663bc
--- /dev/null
+++ b/po/sd.po
@@ -0,0 +1,706 @@
+# Sindhi translation for simple-scan
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the simple-scan package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: simple-scan\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-04-17 06:12+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"Language-Team: Sindhi <sd@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: 2013-09-13 05:46+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
+
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "سادو اسڪين"
+
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: ../data/simple-scan.ui.h:4
+msgid "_Document"
+msgstr "_دستاويز"
+
+#. Scan menu item
+#: ../data/simple-scan.ui.h:6
+msgid "Sc_an"
+msgstr "_اسڪين"
+
+#. Toolbar scan menu item to scan a single page from the scanner
+#: ../data/simple-scan.ui.h:8
+msgid "Single _Page"
+msgstr "هڪڙو _صفحو"
+
+#. Toolbar scan menu item to scan all pages from a document feeder
+#: ../data/simple-scan.ui.h:10
+msgid "All Pages From _Feeder"
+msgstr ""
+
+#. Menu entry to stop current scan
+#: ../data/simple-scan.ui.h:12
+msgid "_Stop Scan"
+msgstr "اسڪين _روڪيو"
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:14
+msgid "Text"
+msgstr "تحرير"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:16
+msgid "Photo"
+msgstr "فوٽو"
+
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr "_ايميل"
+
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr "_صفحو"
+
+#. Menu item to rotate page to left (anti-clockwise)
+#: ../data/simple-scan.ui.h:22
+msgid "Rotate _Left"
+msgstr "_کاٻي ڦيرايو"
+
+#. Menu item to rotate page to right (clockwise)
+#: ../data/simple-scan.ui.h:24
+msgid "Rotate _Right"
+msgstr "_ساڄي ڦيرايو"
+
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "_ڪاٽيو"
+
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "_ڪوبه نه"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "_Letter"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "Le_gal"
+
+#. Radio button for cropping page to 4x6 inch
+#: ../data/simple-scan.ui.h:40
+msgid "4&#xD7;6"
+msgstr ""
+
+#. Radio button for cropping to custom page size
+#: ../data/simple-scan.ui.h:42
+msgid "_Custom"
+msgstr "_مرضي مطابق"
+
+#. Menu item to rotate the crop area
+#: ../data/simple-scan.ui.h:44
+msgid "_Rotate Crop"
+msgstr ""
+
+#. Menu item to move the selected page to the left
+#: ../data/simple-scan.ui.h:46
+msgid "Move Left"
+msgstr "کاٻي چوريو"
+
+#. Menu item to move the selected page to the right
+#: ../data/simple-scan.ui.h:48
+msgid "Move Right"
+msgstr "ساڄي چوريو"
+
+#. Label on help menu
+#: ../data/simple-scan.ui.h:50
+msgid "_Help"
+msgstr "_مدد"
+
+#. Help|Contents menu
+#: ../data/simple-scan.ui.h:52
+msgid "_Contents"
+msgstr "_مواد"
+
+#. Tooltip for new document button
+#: ../data/simple-scan.ui.h:54
+msgid "Start a new document"
+msgstr "نئون دستاويز بنايو"
+
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "نئون"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "اسڪينر مان هڪڙو صفحو اسڪين ڪريو"
+
+#. Label on scan toolbar item
+#: ../data/simple-scan.ui.h:59
+msgid "Scan"
+msgstr "اسڪين"
+
+#. Tooltip for save toolbar button
+#: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr "دستاويز کي فائل ۾ سانڍيو"
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "سانڍيو"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
+msgid "Stop the current scan"
+msgstr "هلندڙ اسڪين روڪيو"
+
+#: ../data/simple-scan.ui.h:65
+msgid "Stop"
+msgstr "روڪيو"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: ../data/simple-scan.ui.h:67
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr ""
+
+#. Label on rotate page left (anti-clockwise) item
+#: ../data/simple-scan.ui.h:69
+msgid "Rotate Left"
+msgstr "کاٻي ڦيرايو"
+
+#. Tooltip for rotate right (clockwise) button
+#: ../data/simple-scan.ui.h:71
+msgid "Rotate the page to the right (clockwise)"
+msgstr ""
+
+#. Label on rotate page right (clockwise) item
+#: ../data/simple-scan.ui.h:73
+msgid "Rotate Right"
+msgstr "ساڄي ڦيرايو"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "چونڊيل صفحي کي ڪاٽيو"
+
+#: ../data/simple-scan.ui.h:75
+msgid "Crop"
+msgstr "ڪاٽيو"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:77
+msgid "_Username for resource:"
+msgstr ""
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:79
+msgid "_Password:"
+msgstr "_ڳجھو لفظ:"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:81
+msgid "_Authorize"
+msgstr "_اجازت ڏيو"
+
+#. Title of preferences dialog
+#: ../data/simple-scan.ui.h:83
+msgid "Preferences"
+msgstr "ترجيحون"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:85
+msgid "Scan S_ource:"
+msgstr ""
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:87
+msgid "_Text Resolution:"
+msgstr ""
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:89
+msgid "_Photo Resolution:"
+msgstr ""
+
+#. Label beside scan side combo box
+#: ../data/simple-scan.ui.h:91
+msgid "Scan Side:"
+msgstr "پاسو اسڪين ڪريو:"
+
+#. Label beside page size combo box
+#: ../data/simple-scan.ui.h:93
+msgid "Page Size:"
+msgstr "صفحي جي ماپ:"
+
+#. Label beside brightness scale
+#: ../data/simple-scan.ui.h:95
+msgid "Brightness:"
+msgstr ""
+
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr ""
+
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr ""
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "اڳيون ۽ پويون"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "اڳيون"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "پوئتي"
+
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "دستاويزات اسڪين ڪريو"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "اسڪين ڪرڻ لاءِ اوزار"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+msgid "SANE device to acquire images from."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "اسڪين ٿيندڙ دستاويز جو قسم"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "اسڪين جو رخ"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
+msgid ""
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
+msgid ""
+"The height of scanned image in pixels. This value is updated to what the "
+"last scanned page was."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
+msgid "The resolution in dots-per-inch of the previously scanned image."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "اسڪين ڪرڻ لاءِ صفحي جو پاسو"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "فائلون سانڍڻ لاءِ خانو"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr ""
+
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:814
+msgid "No scanners available.  Please connect a scanner."
+msgstr ""
+
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:844
+msgid "Unable to connect to scanner"
+msgstr ""
+
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1207
+msgid "Unable to start scan"
+msgstr ""
+
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+msgid "Error communicating with scanner"
+msgstr ""
+
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr ""
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr ""
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:297
+msgid "Failed to scan"
+msgstr "اسڪين ڪرڻ ۾ ناڪامي"
+
+#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
+#: ../src/simple-scan.vala:316
+msgid "Scanned Document"
+msgstr "اسڪين ٿيل دستاويز"
+
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr ""
+
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
+#, c-format
+msgid "Run '%s --help' to see a full list of available command line options."
+msgstr ""
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "اسڪين دستاويز.pdf"
+
+#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
+#: ../src/ui.vala:159
+#, c-format
+msgid "Username and password required to access '%s'"
+msgstr ""
+
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:202
+msgid "No scanners detected"
+msgstr ""
+
+#. Hint to user on why there are no scanners detected
+#: ../src/ui.vala:204
+msgid "Please check your scanner is connected and powered on"
+msgstr ""
+
+#. Save dialog: Dialog title
+#: ../src/ui.vala:363
+msgid "Save As..."
+msgstr "هينئن سانڍيو..."
+
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:377
+msgid "Image Files"
+msgstr "شڪل فائلون"
+
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:383
+msgid "All Files"
+msgstr "تمام فائلون"
+
+#. 
+#: ../src/ui.vala:388
+msgid "Select File _Type"
+msgstr "فائل جو _قسم چونڊيو"
+
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr ""
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr ""
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr ""
+
+#. Title of error dialog when save failed
+#: ../src/ui.vala:503
+msgid "Failed to save file"
+msgstr "فائل سانڍڻ ۾ ناڪامي"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:526
+msgid "If you don't save, changes will be permanently lost."
+msgstr ""
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:563
+msgid "Save current document?"
+msgstr "هاڻوڪو دستاويز سانڍيو؟"
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:565
+msgid "Discard Changes"
+msgstr "تبديليون منسوخ ڪريو"
+
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.vala:872
+msgid "Unable to open image preview application"
+msgstr ""
+
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1119
+msgid "Unable to open help file"
+msgstr "سهڪاري فائل ڀرڻ ۾ ناڪام"
+
+#. The license this software is under (GPL3+)
+#: ../src/ui.vala:1130
+msgid ""
+"This program is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 3 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program.  If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+
+#. Title of about dialog
+#: ../src/ui.vala:1133
+msgid "About Simple Scan"
+msgstr "سادي اسڪين بابت"
+
+#. Description of program
+#: ../src/ui.vala:1136
+msgid "Simple document scanning tool"
+msgstr "سادو دستاويز اسڪين ڪندڙ اوزار"
+
+#: ../src/ui.vala:1145
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Abdul-Rahim Nizamani https://launchpad.net/~ghaffari"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1156
+msgid "Save document before quitting?"
+msgstr "نڪرڻ کان پهرين دستاويز سانڍيو؟"
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1158
+msgid "Quit without Saving"
+msgstr "سانڍڻ بغير نڪرو"
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr ""
+
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1292
+#, c-format
+msgid "%d dpi (draft)"
+msgstr ""
+
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1295
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr ""
+
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
+#, c-format
+msgid "%d dpi"
+msgstr ""
+
+#. Title of dialog when cannot load required files
+#: ../src/ui.vala:1333
+msgid "Files missing"
+msgstr "فائلون وڃايل"
+
+#. Description in dialog when cannot load required files
+#: ../src/ui.vala:1335
+msgid "Please check your installation"
+msgstr ""
+
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1403
+msgid "Change _Scanner"
+msgstr "اسڪينر _تبديل ڪريو"
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1409
+msgid "Automatic"
+msgstr "پاڻمرادو"
+
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr ""
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr ""
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr ""
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr ""
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr ""
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr ""
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr ""
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr ""
diff --git a/po/se.po b/po/se.po
new file mode 100644
index 0000000..911e904
--- /dev/null
+++ b/po/se.po
@@ -0,0 +1,706 @@
+# Northern Sami translation for simple-scan
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the simple-scan package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: simple-scan\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-08-18 11:22+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Northern Sami <se@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: 2013-09-13 05:46+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
+
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Simple Scan"
+
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: ../data/simple-scan.ui.h:4
+msgid "_Document"
+msgstr "_Dokumeanta"
+
+#. Scan menu item
+#: ../data/simple-scan.ui.h:6
+msgid "Sc_an"
+msgstr ""
+
+#. Toolbar scan menu item to scan a single page from the scanner
+#: ../data/simple-scan.ui.h:8
+msgid "Single _Page"
+msgstr ""
+
+#. Toolbar scan menu item to scan all pages from a document feeder
+#: ../data/simple-scan.ui.h:10
+msgid "All Pages From _Feeder"
+msgstr ""
+
+#. Menu entry to stop current scan
+#: ../data/simple-scan.ui.h:12
+msgid "_Stop Scan"
+msgstr ""
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:14
+msgid "Text"
+msgstr "Teaksta"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:16
+msgid "Photo"
+msgstr "Fotografiija"
+
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr "_E-boasta"
+
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr ""
+
+#. Menu item to rotate page to left (anti-clockwise)
+#: ../data/simple-scan.ui.h:22
+msgid "Rotate _Left"
+msgstr ""
+
+#. Menu item to rotate page to right (clockwise)
+#: ../data/simple-scan.ui.h:24
+msgid "Rotate _Right"
+msgstr ""
+
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "_Čuohpa"
+
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr ""
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr ""
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr ""
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr ""
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr ""
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr ""
+
+#. Radio button for cropping page to 4x6 inch
+#: ../data/simple-scan.ui.h:40
+msgid "4&#xD7;6"
+msgstr ""
+
+#. Radio button for cropping to custom page size
+#: ../data/simple-scan.ui.h:42
+msgid "_Custom"
+msgstr ""
+
+#. Menu item to rotate the crop area
+#: ../data/simple-scan.ui.h:44
+msgid "_Rotate Crop"
+msgstr ""
+
+#. Menu item to move the selected page to the left
+#: ../data/simple-scan.ui.h:46
+msgid "Move Left"
+msgstr ""
+
+#. Menu item to move the selected page to the right
+#: ../data/simple-scan.ui.h:48
+msgid "Move Right"
+msgstr "Sirdde olgešguvlui"
+
+#. Label on help menu
+#: ../data/simple-scan.ui.h:50
+msgid "_Help"
+msgstr "_Veahkki"
+
+#. Help|Contents menu
+#: ../data/simple-scan.ui.h:52
+msgid "_Contents"
+msgstr ""
+
+#. Tooltip for new document button
+#: ../data/simple-scan.ui.h:54
+msgid "Start a new document"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "Ođđa"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr ""
+
+#. Label on scan toolbar item
+#: ../data/simple-scan.ui.h:59
+msgid "Scan"
+msgstr "Oza"
+
+#. Tooltip for save toolbar button
+#: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "Vurke"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
+msgid "Stop the current scan"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:65
+msgid "Stop"
+msgstr "Bisset"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: ../data/simple-scan.ui.h:67
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr ""
+
+#. Label on rotate page left (anti-clockwise) item
+#: ../data/simple-scan.ui.h:69
+msgid "Rotate Left"
+msgstr ""
+
+#. Tooltip for rotate right (clockwise) button
+#: ../data/simple-scan.ui.h:71
+msgid "Rotate the page to the right (clockwise)"
+msgstr ""
+
+#. Label on rotate page right (clockwise) item
+#: ../data/simple-scan.ui.h:73
+msgid "Rotate Right"
+msgstr "Jorat olgešguvlui"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:75
+msgid "Crop"
+msgstr ""
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:77
+msgid "_Username for resource:"
+msgstr ""
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:79
+msgid "_Password:"
+msgstr "_Beassansátni:"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:81
+msgid "_Authorize"
+msgstr ""
+
+#. Title of preferences dialog
+#: ../data/simple-scan.ui.h:83
+msgid "Preferences"
+msgstr "Oidimat"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:85
+msgid "Scan S_ource:"
+msgstr ""
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:87
+msgid "_Text Resolution:"
+msgstr ""
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:89
+msgid "_Photo Resolution:"
+msgstr ""
+
+#. Label beside scan side combo box
+#: ../data/simple-scan.ui.h:91
+msgid "Scan Side:"
+msgstr ""
+
+#. Label beside page size combo box
+#: ../data/simple-scan.ui.h:93
+msgid "Page Size:"
+msgstr ""
+
+#. Label beside brightness scale
+#: ../data/simple-scan.ui.h:95
+msgid "Brightness:"
+msgstr ""
+
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr ""
+
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr ""
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr ""
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "Ovdabealli"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "Maŋos"
+
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+msgid "SANE device to acquire images from."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
+msgid ""
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
+msgid ""
+"The height of scanned image in pixels. This value is updated to what the "
+"last scanned page was."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
+msgid "The resolution in dots-per-inch of the previously scanned image."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr ""
+
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:814
+msgid "No scanners available.  Please connect a scanner."
+msgstr ""
+
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:844
+msgid "Unable to connect to scanner"
+msgstr ""
+
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1207
+msgid "Unable to start scan"
+msgstr ""
+
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+msgid "Error communicating with scanner"
+msgstr ""
+
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr ""
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr ""
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:297
+msgid "Failed to scan"
+msgstr ""
+
+#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
+#: ../src/simple-scan.vala:316
+msgid "Scanned Document"
+msgstr ""
+
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr ""
+
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
+#, c-format
+msgid "Run '%s --help' to see a full list of available command line options."
+msgstr ""
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr ""
+
+#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
+#: ../src/ui.vala:159
+#, c-format
+msgid "Username and password required to access '%s'"
+msgstr ""
+
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:202
+msgid "No scanners detected"
+msgstr ""
+
+#. Hint to user on why there are no scanners detected
+#: ../src/ui.vala:204
+msgid "Please check your scanner is connected and powered on"
+msgstr ""
+
+#. Save dialog: Dialog title
+#: ../src/ui.vala:363
+msgid "Save As..."
+msgstr "Vurke nugo …"
+
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:377
+msgid "Image Files"
+msgstr ""
+
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:383
+msgid "All Files"
+msgstr "Buot fiillat"
+
+#. 
+#: ../src/ui.vala:388
+msgid "Select File _Type"
+msgstr ""
+
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr ""
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr ""
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr ""
+
+#. Title of error dialog when save failed
+#: ../src/ui.vala:503
+msgid "Failed to save file"
+msgstr ""
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:526
+msgid "If you don't save, changes will be permanently lost."
+msgstr ""
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:563
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:565
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.vala:872
+msgid "Unable to open image preview application"
+msgstr ""
+
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1119
+msgid "Unable to open help file"
+msgstr ""
+
+#. The license this software is under (GPL3+)
+#: ../src/ui.vala:1130
+msgid ""
+"This program is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 3 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program.  If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+
+#. Title of about dialog
+#: ../src/ui.vala:1133
+msgid "About Simple Scan"
+msgstr "Simple Scan-dieđut"
+
+#. Description of program
+#: ../src/ui.vala:1136
+msgid "Simple document scanning tool"
+msgstr ""
+
+#: ../src/ui.vala:1145
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Christopher Forster https://launchpad.net/~christopherforster"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1156
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1158
+msgid "Quit without Saving"
+msgstr ""
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr ""
+
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1292
+#, c-format
+msgid "%d dpi (draft)"
+msgstr ""
+
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1295
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr ""
+
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
+#, c-format
+msgid "%d dpi"
+msgstr ""
+
+#. Title of dialog when cannot load required files
+#: ../src/ui.vala:1333
+msgid "Files missing"
+msgstr ""
+
+#. Description in dialog when cannot load required files
+#: ../src/ui.vala:1335
+msgid "Please check your installation"
+msgstr ""
+
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1403
+msgid "Change _Scanner"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1409
+msgid "Automatic"
+msgstr "Automáhtalaš"
+
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr ""
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr ""
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr ""
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr ""
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr ""
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr ""
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr ""
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr ""
diff --git a/po/shn.po b/po/shn.po
new file mode 100644
index 0000000..6a66552
--- /dev/null
+++ b/po/shn.po
@@ -0,0 +1,704 @@
+# Shan translation for simple-scan
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the simple-scan package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: simple-scan\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-04-17 06:12+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"Language-Team: Shan <shn@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: 2013-09-13 05:46+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
+
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr ""
+
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: ../data/simple-scan.ui.h:4
+msgid "_Document"
+msgstr ""
+
+#. Scan menu item
+#: ../data/simple-scan.ui.h:6
+msgid "Sc_an"
+msgstr ""
+
+#. Toolbar scan menu item to scan a single page from the scanner
+#: ../data/simple-scan.ui.h:8
+msgid "Single _Page"
+msgstr ""
+
+#. Toolbar scan menu item to scan all pages from a document feeder
+#: ../data/simple-scan.ui.h:10
+msgid "All Pages From _Feeder"
+msgstr ""
+
+#. Menu entry to stop current scan
+#: ../data/simple-scan.ui.h:12
+msgid "_Stop Scan"
+msgstr ""
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:14
+msgid "Text"
+msgstr ""
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:16
+msgid "Photo"
+msgstr ""
+
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr ""
+
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr ""
+
+#. Menu item to rotate page to left (anti-clockwise)
+#: ../data/simple-scan.ui.h:22
+msgid "Rotate _Left"
+msgstr ""
+
+#. Menu item to rotate page to right (clockwise)
+#: ../data/simple-scan.ui.h:24
+msgid "Rotate _Right"
+msgstr ""
+
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr ""
+
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr ""
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr ""
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr ""
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr ""
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr ""
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr ""
+
+#. Radio button for cropping page to 4x6 inch
+#: ../data/simple-scan.ui.h:40
+msgid "4&#xD7;6"
+msgstr ""
+
+#. Radio button for cropping to custom page size
+#: ../data/simple-scan.ui.h:42
+msgid "_Custom"
+msgstr ""
+
+#. Menu item to rotate the crop area
+#: ../data/simple-scan.ui.h:44
+msgid "_Rotate Crop"
+msgstr ""
+
+#. Menu item to move the selected page to the left
+#: ../data/simple-scan.ui.h:46
+msgid "Move Left"
+msgstr ""
+
+#. Menu item to move the selected page to the right
+#: ../data/simple-scan.ui.h:48
+msgid "Move Right"
+msgstr ""
+
+#. Label on help menu
+#: ../data/simple-scan.ui.h:50
+msgid "_Help"
+msgstr ""
+
+#. Help|Contents menu
+#: ../data/simple-scan.ui.h:52
+msgid "_Contents"
+msgstr ""
+
+#. Tooltip for new document button
+#: ../data/simple-scan.ui.h:54
+msgid "Start a new document"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr ""
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr ""
+
+#. Label on scan toolbar item
+#: ../data/simple-scan.ui.h:59
+msgid "Scan"
+msgstr ""
+
+#. Tooltip for save toolbar button
+#: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr ""
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
+msgid "Stop the current scan"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:65
+msgid "Stop"
+msgstr ""
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: ../data/simple-scan.ui.h:67
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr ""
+
+#. Label on rotate page left (anti-clockwise) item
+#: ../data/simple-scan.ui.h:69
+msgid "Rotate Left"
+msgstr ""
+
+#. Tooltip for rotate right (clockwise) button
+#: ../data/simple-scan.ui.h:71
+msgid "Rotate the page to the right (clockwise)"
+msgstr ""
+
+#. Label on rotate page right (clockwise) item
+#: ../data/simple-scan.ui.h:73
+msgid "Rotate Right"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:75
+msgid "Crop"
+msgstr ""
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:77
+msgid "_Username for resource:"
+msgstr ""
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:79
+msgid "_Password:"
+msgstr ""
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:81
+msgid "_Authorize"
+msgstr ""
+
+#. Title of preferences dialog
+#: ../data/simple-scan.ui.h:83
+msgid "Preferences"
+msgstr ""
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:85
+msgid "Scan S_ource:"
+msgstr ""
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:87
+msgid "_Text Resolution:"
+msgstr ""
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:89
+msgid "_Photo Resolution:"
+msgstr ""
+
+#. Label beside scan side combo box
+#: ../data/simple-scan.ui.h:91
+msgid "Scan Side:"
+msgstr ""
+
+#. Label beside page size combo box
+#: ../data/simple-scan.ui.h:93
+msgid "Page Size:"
+msgstr ""
+
+#. Label beside brightness scale
+#: ../data/simple-scan.ui.h:95
+msgid "Brightness:"
+msgstr ""
+
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr ""
+
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr ""
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr ""
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr ""
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+msgid "SANE device to acquire images from."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
+msgid ""
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
+msgid ""
+"The height of scanned image in pixels. This value is updated to what the "
+"last scanned page was."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
+msgid "The resolution in dots-per-inch of the previously scanned image."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr ""
+
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:814
+msgid "No scanners available.  Please connect a scanner."
+msgstr ""
+
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:844
+msgid "Unable to connect to scanner"
+msgstr ""
+
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1207
+msgid "Unable to start scan"
+msgstr ""
+
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+msgid "Error communicating with scanner"
+msgstr ""
+
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr ""
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr ""
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:297
+msgid "Failed to scan"
+msgstr ""
+
+#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
+#: ../src/simple-scan.vala:316
+msgid "Scanned Document"
+msgstr ""
+
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr ""
+
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
+#, c-format
+msgid "Run '%s --help' to see a full list of available command line options."
+msgstr ""
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr ""
+
+#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
+#: ../src/ui.vala:159
+#, c-format
+msgid "Username and password required to access '%s'"
+msgstr ""
+
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:202
+msgid "No scanners detected"
+msgstr ""
+
+#. Hint to user on why there are no scanners detected
+#: ../src/ui.vala:204
+msgid "Please check your scanner is connected and powered on"
+msgstr ""
+
+#. Save dialog: Dialog title
+#: ../src/ui.vala:363
+msgid "Save As..."
+msgstr ""
+
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:377
+msgid "Image Files"
+msgstr ""
+
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:383
+msgid "All Files"
+msgstr ""
+
+#. 
+#: ../src/ui.vala:388
+msgid "Select File _Type"
+msgstr ""
+
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr ""
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr ""
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr ""
+
+#. Title of error dialog when save failed
+#: ../src/ui.vala:503
+msgid "Failed to save file"
+msgstr ""
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:526
+msgid "If you don't save, changes will be permanently lost."
+msgstr ""
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:563
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:565
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.vala:872
+msgid "Unable to open image preview application"
+msgstr ""
+
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1119
+msgid "Unable to open help file"
+msgstr ""
+
+#. The license this software is under (GPL3+)
+#: ../src/ui.vala:1130
+msgid ""
+"This program is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 3 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program.  If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+
+#. Title of about dialog
+#: ../src/ui.vala:1133
+msgid "About Simple Scan"
+msgstr ""
+
+#. Description of program
+#: ../src/ui.vala:1136
+msgid "Simple document scanning tool"
+msgstr ""
+
+#: ../src/ui.vala:1145
+msgid "translator-credits"
+msgstr ""
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1156
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1158
+msgid "Quit without Saving"
+msgstr ""
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr ""
+
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1292
+#, c-format
+msgid "%d dpi (draft)"
+msgstr ""
+
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1295
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr ""
+
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
+#, c-format
+msgid "%d dpi"
+msgstr ""
+
+#. Title of dialog when cannot load required files
+#: ../src/ui.vala:1333
+msgid "Files missing"
+msgstr ""
+
+#. Description in dialog when cannot load required files
+#: ../src/ui.vala:1335
+msgid "Please check your installation"
+msgstr ""
+
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1403
+msgid "Change _Scanner"
+msgstr ""
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1409
+msgid "Automatic"
+msgstr ""
+
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr ""
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr ""
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr ""
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr ""
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr ""
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr ""
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr ""
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr ""
diff --git a/po/sk.po b/po/sk.po
index 09daffb..c5bfb25 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,323 +7,347 @@ msgid ""
 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-02-13 20:04+0000\n"
-"Last-Translator: Laco Gubík <Unknown>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-07-23 09:07+0000\n"
+"Last-Translator: Robert Ancell <robert.ancell@canonical.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-22 04:48+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Jednoduché skenovanie"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr "A_4"
+msgid "_Document"
+msgstr "_Dokument"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr ""
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "_Jedna stránka"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:10
 msgid "All Pages From _Feeder"
 msgstr "_Všetky stránky zo zásobníka"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr ""
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
-msgstr "Orezanie"
+msgid "_Stop Scan"
+msgstr "_Zastaviť skenovanie"
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr ""
+msgid "Text"
+msgstr "Text"
 
-#. Combo box label for scanning the front side of a page
+#. Combo box label for photo scan mode
 #: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr ""
+msgid "Photo"
+msgstr "Fotografia"
 
-#. Combo box label for scanning both sides of a page
+#. Label on email menu item
 #: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
+msgid "_Email"
 msgstr ""
 
-#. Radio button for cropping to page to US legal size
+#. Page menu (contains action for each page, e.g. delete, crop)
 #: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr "Le_gal"
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr "Nový"
-
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr ""
-
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
-msgid "Photo"
-msgstr "Fotografia"
-
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr "Predvoľby"
-
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
-msgstr "Otočiť doľava"
-
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr "Otočiť doprava"
+msgid "_Page"
+msgstr "_Stránka"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
+#: ../data/simple-scan.ui.h:22
 msgid "Rotate _Left"
 msgstr "Otočiť _doľava"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
+#: ../data/simple-scan.ui.h:24
 msgid "Rotate _Right"
 msgstr "Otočiť do_prava"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr ""
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "_Orezanie"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr ""
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "Žia_dne"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "US _List"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "Le_gal"
 
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr "Uložiť"
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr ""
+msgid "_Custom"
+msgstr "_Vlastné"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr ""
+msgid "_Rotate Crop"
+msgstr "_Otočiť výrez"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
-msgstr "Skenovať"
+msgid "Move Left"
+msgstr ""
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr "Zdroj s_kenovania:"
+msgid "Move Right"
+msgstr ""
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr ""
+msgid "_Help"
+msgstr "_Pomocník"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
-msgstr "Oskenovať jednu stránku zo skeneru"
-
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr "Jednoduché skenovanie"
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr "_Jedna stránka"
+msgid "_Contents"
+msgstr ""
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
 msgstr "Vytvoriť nový dokument"
 
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "Nový"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "Oskenovať jednu stránku zo skeneru"
+
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
+msgid "Scan"
+msgstr "Skenovať"
+
+#. Tooltip for save toolbar button
+#: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
 msgstr ""
 
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "Uložiť"
+
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:64
 msgid "Stop the current scan"
 msgstr ""
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr "Text"
-
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr "_Schváliť"
+msgid "Stop"
+msgstr ""
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
+msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr "_Orezanie"
+msgid "Rotate Left"
+msgstr "Otočiť doľava"
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr "_Vlastné"
+msgid "Rotate the page to the right (clockwise)"
+msgstr ""
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr "_Dokument"
+msgid "Rotate Right"
+msgstr "Otočiť doprava"
 
-#. Label on email menu item
-#: ../data/simple-scan.ui.h:75
-msgid "_Email"
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
 msgstr ""
 
-#. Label on help menu
+#: ../data/simple-scan.ui.h:75
+msgid "Crop"
+msgstr "Orezanie"
+
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr "_Pomocník"
+msgid "_Username for resource:"
+msgstr "_Užívateľské meno pre zdroj:"
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr "US _List"
+msgid "_Password:"
+msgstr "_Heslo:"
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr "Žia_dne"
+msgid "_Authorize"
+msgstr "_Schváliť"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr "_Stránka"
+msgid "Preferences"
+msgstr "Predvoľby"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr "_Heslo:"
+msgid "Scan S_ource:"
+msgstr "Zdroj s_kenovania:"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
+msgid "_Text Resolution:"
 msgstr ""
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr "_Otočiť výrez"
+msgid "_Photo Resolution:"
+msgstr ""
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
-msgstr "_Zastaviť skenovanie"
+msgid "Scan Side:"
+msgstr ""
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
+msgid "Page Size:"
 msgstr ""
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
-msgstr "_Užívateľské meno pre zdroj:"
+msgid "Brightness:"
+msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
-msgstr "Skenovať dokumenty"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
-msgstr "Zariadenie z ktorého skenovať"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
-msgstr "Smer skenovania"
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr "Výška skenovaného obrázku"
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "Skenovať dokumenty"
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "Šírka okna v pixeloch"
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "Výška okna v pixeloch"
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "TRUE pokiaľ je aplikačné okno v maximálnej veľkosti"
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "Zariadenie z ktorého skenovať"
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
 msgstr "Zariadenie SANE z ktorého získať obrázky."
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
-msgstr "TRUE pokiaľ je aplikačné okno v maximálnej veľkosti"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "Druh dokumentu ktorý sa skenuje"
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+"Typ dokumentu ktorý sa skenuje. Toto nastavenie určuje rozlíšenie, farby a "
+"spracovanie tohto skenu."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "Smer skenovania"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
 msgstr ""
-"Smer skeneru naprieč skenovanou stránkou. Môže to byť jedno z následujúcich: "
-"'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "Šírka skenovaného obrázku v pixeloch"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
 msgstr ""
+"Šírka skenovaného obrázku. Táto hodnota sa aktualizuje podľa poslednej "
+"skenovanej stránky."
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "Výška skenovaného obrázku"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
@@ -331,236 +355,242 @@ msgstr ""
 "Výška skenovaného obrázku. Táto hodnota sa aktualizuje podľa poslednej "
 "skenovanej stránky."
 
-#: ../data/simple-scan.schemas.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
 msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
 msgstr ""
-"Šírka skenovaného obrázku. Táto hodnota sa aktualizuje podľa poslednej "
-"skenovanej stránky."
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
-msgstr "Druh dokumentu ktorý sa skenuje"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
 msgstr ""
-"Druh dokumentu ktorý sa skenuje. 'text' pre textové dokumenty, 'photo' pre "
-"fotografie. Táto hodnota určuje rozlíšenie skenovania, farby a koncové "
-"spracovanie."
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
-msgstr "Šírka skenovaného obrázku v pixeloch"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
-msgstr "Výška okna v pixeloch"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
-msgstr "Šírka okna v pixeloch"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Žiaden skener nie je k dispozícii. Prosím pripojte skener."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
 msgstr "Nie je možné pripojiť sa ku skeneru"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
 msgstr "Nie je možné začať skenovať"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
 msgstr "Chyba v komunikácii so skenerom"
 
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Zobrazí verziu vydania"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Vypíše správy ladenia"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+"Opraviť .pdf súbory vytvorené staršími verziami programu Jednoduché "
+"skenovanie"
+
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
 msgstr "Skenovanie zlyhalo"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
 msgstr ""
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[ZARIADENIE…] - Nástroj na skenovanie"
+
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
+msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
-"Použitie:\n"
-"  %s [ZARIADENIE...] - Skenovacia pomôcka"
+"Zoznam všetkých dostupných volieb príkazového riadka zobrazíte spustením „%s "
+"--help“."
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
-#, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
-msgstr ""
-"Možnosti pomocníka:\n"
-"  -d, --debug Zobraziť ladiace správy\n"
-"  -v, --version Zobraziť verziu vydania\n"
-"  -h, --help Zobraziť možnosti pomocníka\n"
-"  --help-all Zobraziť všetky možnosti pomocníka\n"
-"  --help-gtk Zobraziť GTK+ možnosti"
-
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
-#, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
-msgstr ""
-"GTK+ Options:\n"
-"  --class=TRIEDA Trieda programu použitá správcom okien\n"
-"  --name=MENO Meno programu použité správcom okien\n"
-"  --screen=OBRAZOVKA X obrazovka ktorá sa má použiť\n"
-"  --sync Zmeniť X volania na asynchrónne\n"
-"  --gtk-module=MODULY Zaviesť dodatočné GTK+ moduly\n"
-"  --g-fatal-warnings Zmeniť všetky upozornenia na terminálne"
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "Naskenovaný dokument.pdf"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Meno používateľa a heslo je vyžadované pre prístup k '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
 msgstr "Žiadne skenery neboli nájdené"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
 msgstr "Prosím skontrolujte či je skener pripojený a zapnutý"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr ""
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr ""
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr ""
-
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
 msgstr "Uložiť ako..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
 msgstr ""
 
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr ""
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr ""
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
 msgstr "Ukladanie súboru zlyhalo"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
 msgstr ""
 
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "Nepodarilo sa uložiť obraz na náhľad"
+
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -590,76 +620,174 @@ msgstr ""
 "licencie GNU. Ak sa tak nestalo, navštívte <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
 msgstr "O programe Jednoduché skenovanie"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
 msgstr "Nástroj na jednoduché skenovanie dokumentov"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  6205 https://launchpad.net/~6205-deactivatedaccount\n"
-"  Laco Gubík https://launchpad.net/~laco"
+"  6205 https://launchpad.net/~6205-reactivated-deactivatedaccount\n"
+"  Alessio Treglia https://launchpad.net/~quadrispro\n"
+"  Laco Gubík https://launchpad.net/~laco\n"
+"  Pavol Klačanský https://launchpad.net/~pavolzetor\n"
+"  Robert Ancell https://launchpad.net/~robert-ancell"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
 msgstr ""
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
 #, c-format
-msgid "%d dpi (draft)"
+msgid "%d dpi (default)"
 msgstr ""
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1292
 #, c-format
-msgid "%d dpi"
+msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
+msgid "%d dpi"
 msgstr ""
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
 msgstr "Chýbajúce súbory"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
 msgstr "Prosím skontrolujte vašu inštaláciu"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
 msgstr "Zmeniť _skener"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
-msgstr "Naskenovaný dokument.pdf"
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr ""
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr ""
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr ""
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr ""
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr ""
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr ""
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "Ukladá sa dokument…"
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "Ukladá sa %d. strana z %d"
+
+#~ msgid ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ msgstr ""
+#~ "Smer skeneru naprieč skenovanou stránkou. Môže to byť jedno z následujúcich: "
+#~ "'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+
+#~ msgid ""
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
+#~ msgstr ""
+#~ "Druh dokumentu ktorý sa skenuje. 'text' pre textové dokumenty, 'photo' pre "
+#~ "fotografie. Táto hodnota určuje rozlíšenie skenovania, farby a koncové "
+#~ "spracovanie."
+
+#, c-format
+#~ msgid ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+#~ msgstr ""
+#~ "Možnosti pomocníka:\n"
+#~ "  -d, --debug Zobraziť ladiace správy\n"
+#~ "  -v, --version Zobraziť verziu vydania\n"
+#~ "  -h, --help Zobraziť možnosti pomocníka\n"
+#~ "  --help-all Zobraziť všetky možnosti pomocníka\n"
+#~ "  --help-gtk Zobraziť GTK+ možnosti"
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "Použitie:\n"
+#~ "  %s [ZARIADENIE...] - Skenovacia pomôcka"
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "GTK+ Options:\n"
+#~ "  --class=TRIEDA Trieda programu použitá správcom okien\n"
+#~ "  --name=MENO Meno programu použité správcom okien\n"
+#~ "  --screen=OBRAZOVKA X obrazovka ktorá sa má použiť\n"
+#~ "  --sync Zmeniť X volania na asynchrónne\n"
+#~ "  --gtk-module=MODULY Zaviesť dodatočné GTK+ moduly\n"
+#~ "  --g-fatal-warnings Zmeniť všetky upozornenia na terminálne"
diff --git a/po/sl.po b/po/sl.po
index a96b2af..061dff4 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,325 +7,347 @@ msgid ""
 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-04 07:44+0000\n"
-"Last-Translator: Klemen Košir <klemen913@gmail.com>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-07-23 09:19+0000\n"
+"Last-Translator: Andrej Znidarsic <andrej.znidarsic@gmail.com>\n"
 "Language-Team: Slovenian <sl@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-10-22 04:48+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Enostavno optično branje"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr "A_4"
+msgid "_Document"
+msgstr "_Dokument"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr "Op_tično branje"
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "Ena _stran"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:10
 msgid "All Pages From _Feeder"
 msgstr "Vse strani iz _podajalnika"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr "Hrbtna stran"
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
-msgstr "Obreži"
+msgid "_Stop Scan"
+msgstr "_Zaustavi optično branje"
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr "Obreži izbrano stran"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr "Prednja stran"
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr "Hrbtna in prednja stran"
-
-#. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr "Velikost ZDA Le_gal"
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr "Novo"
-
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr "Velikost strani:"
+msgid "Text"
+msgstr "Besedilo"
 
 #. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
+#: ../data/simple-scan.ui.h:16
 msgid "Photo"
 msgstr "Fotografija"
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr "Možnosti"
-
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
-msgstr "Zavrti levo"
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr "_Elektronska pošta"
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr "Zavrti desno"
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr "_Stran"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
+#: ../data/simple-scan.ui.h:22
 msgid "Rotate _Left"
 msgstr "Zavrti _levo"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
+#: ../data/simple-scan.ui.h:24
 msgid "Rotate _Right"
 msgstr "Zavrti _desno"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Obrni stran v levo (nasprotna smer urinega kazalca)"
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "_Obreži"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Obrni stran v desno (smer urinega kazalca)"
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "_Brez"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
 
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "_Pismo"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "Velikost ZDA Le_gal"
+
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr "Shrani"
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr "Shrani dokument v datoteko"
+msgid "_Custom"
+msgstr "_Po meri"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr "Op_tično branje"
+msgid "_Rotate Crop"
+msgstr "_Zavrti obrezovano območje"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
-msgstr "Optično branje"
+msgid "Move Left"
+msgstr "Premakni levo"
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr "_Vir optičnega branja:"
+msgid "Move Right"
+msgstr "Premakni desno"
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr "Stran optičnega branja:"
+msgid "_Help"
+msgstr "Pomo_č"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
-msgstr "Optično branje ene strani iz optičnega bralnika"
-
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr "Enostavno optično branje"
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr "Ena _stran"
+msgid "_Contents"
+msgstr "_Vsebina"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
 msgstr "Začni nov dokument"
 
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "Novo"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "Optično branje ene strani iz optičnega bralnika"
+
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
-msgstr "Zaustavi"
+msgid "Scan"
+msgstr "Optično branje"
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr "Shrani dokument v datoteko"
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "Shrani"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
 msgid "Stop the current scan"
 msgstr "Zaustavi trenutno optično branje"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr "Besedilo"
-
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr "_Pooblasti"
+msgid "Stop"
+msgstr "Zaustavi"
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
-msgstr "_Vsebina"
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Obrni stran v levo (nasprotna smer urinega kazalca)"
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr "_Obreži"
+msgid "Rotate Left"
+msgstr "Zavrti levo"
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr "_Po meri"
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Obrni stran v desno (smer urinega kazalca)"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr "_Dokument"
+msgid "Rotate Right"
+msgstr "Zavrti desno"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "Obreži izbrano stran"
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
-msgstr "_Elektronska pošta"
+msgid "Crop"
+msgstr "Obreži"
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr "Pomo_č"
+msgid "_Username for resource:"
+msgstr "_Uporabniško ime za vir:"
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr "_Pismo"
+msgid "_Password:"
+msgstr "_Geslo:"
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr "_Brez"
+msgid "_Authorize"
+msgstr "_Pooblasti"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr "_Stran"
+msgid "Preferences"
+msgstr "Možnosti"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr "_Geslo:"
+msgid "Scan S_ource:"
+msgstr "_Vir optičnega branja:"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
-msgstr "_Ločljivost fotografij:"
+msgid "_Text Resolution:"
+msgstr "_Ločljivost besedila:"
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr "_Zavrti obrezovano območje"
+msgid "_Photo Resolution:"
+msgstr "_Ločljivost fotografij:"
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
-msgstr "_Zaustavi optično branje"
+msgid "Scan Side:"
+msgstr "Stran optičnega branja:"
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
-msgstr "_Ločljivost besedila:"
+msgid "Page Size:"
+msgstr "Velikost strani:"
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
-msgstr "_Uporabniško ime za vir:"
+msgid "Brightness:"
+msgstr "Svetlost:"
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
-msgstr "Optično preberite dokumente"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr "Kontrast:"
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
-msgstr "Naprava za optično branje"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr "Kakovost:"
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
-msgstr "Smer optičnega branja"
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "Prednja in hrbtna stran"
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
-msgstr "Mapa za shranjevanje datotek"
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "Prednja stran"
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
-msgstr "Višina papirja v desetinkah milimetra"
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "Hrbtna stran"
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr "Višina optično prebrane slike v točkah"
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "Optično preberite dokumente"
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
-msgstr "Stran strani za optično branje"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "Širina okna v točkah"
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
-msgstr "Ločljivost za optično branje fotografij"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "Višina okna v točkah"
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
-msgstr "Ločljivost za optično branje besedil"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "PRAV, če je okno programa razpeto"
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
-msgstr "Ločljivost zadnjega optičnega branja"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "Naprava za optično branje"
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
 msgstr "Naprava SANE za pridobivanje slik."
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
-msgstr "PRAV, če je okno programa razpeto"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "Vrsta optično branega dokumenta"
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
-"Smer optičnega branja čez optično brano stran. Lahko je ena od naslednjih: "
-"'od-zgoraj-navzdol' 'od-spodaj-navzgor' 'od-leve-proti-desni' 'od-desne-"
-"proti-levi'"
+"Vrsta dokumenta za optično branje. Ta nastavitev določi ločljivost tiskanja, "
+"barve in poobdelovo."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "Smer optičnega branja"
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "Smer optičnega bralnika na optično brani strani."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "Širina optično brane slike v točkah"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
 msgstr ""
-"Mapa za shranjevanje datotek. Privzeto mapa dokumentov, če ni nastavljena."
+"Širina optično brane slike v točkah. Ta vrednost je posodobljena na vrednost "
+"zadnje optično brane strani."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "Višina optično prebrane slike v točkah"
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
@@ -333,7 +355,22 @@ msgstr ""
 "Višina optično brane slike v točkah. Ta vrednost je posodobljena na vrednost "
 "zadnje optično prebrane strani."
 
-#: ../data/simple-scan.schemas.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "Širina papirja v desetinkah milimetra"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"Širina papirja v desetinkah milimetra (ali 0 za samodejno zaznavanje)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "Višina papirja v desetinkah milimetra"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
@@ -341,233 +378,220 @@ msgstr ""
 "Višina papirja v desetinkah milimetra (ali 0 za samodejno zaznavanje "
 "papirja)."
 
-#: ../data/simple-scan.schemas.in.h:16
-msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
-msgstr ""
-"Stran strani za optično branje. Lahko je eno od naslednjega: 'obe' 'spredaj' "
-"'zadaj'"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr "Svetlost optičnega branja"
 
-#: ../data/simple-scan.schemas.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Prilagoditev svetlosti od -100 do 100 (0 kot brez)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr "Kontrast optičnega branja"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Prilagoditev kontrasta od -100 do 100 (0 kot brez)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "Ločljivost zadnjega optičnega branja"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
 msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr "Ločljivost zadnjega optičnega branja v točkah na palec (dpi)"
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "Ločljivost optičnega branja fotografij v točkah na palec (dpi)"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "Ločljivost za optično branje besedil"
 
-#: ../data/simple-scan.schemas.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "Ločljivost optičnega branja besedil v točkah na palec (dpi)"
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"Širina optično brane slike v točkah. Ta vrednost je posodobljena na vrednost "
-"zadnje optično brane strani."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "Ločljivost za optično branje fotografij"
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Širina papirja v desetinkah milimetra (ali 0 za samodejno zaznavanje)."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "Ločljivost optičnega branja fotografij v točkah na palec (dpi)"
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
-msgstr "Vrsta optično branega dokumenta"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "Stran strani za optično branje"
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
-msgstr ""
-"Vrsta optično branega dokumenta. 'besedilo' za dokumente z besedilom, "
-"'fotografije' za fotografije. Ta nastavitev določi ločljivost optičnega "
-"branja, barve in nadaljnje obdvelovanje"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "Stran strani za optično branje."
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
-msgstr "Širina papirja v desetinkah milimetra"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "Mapa za shranjevanje datotek"
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
-msgstr "Širina optično brane slike v točkah"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Mapa za shranjevanje datotek. Privzeto mapa dokumentov, če ni nastavljena."
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
-msgstr "Višina okna v točkah"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr "Vrednost kakovosti za stiskanje JPEG"
 
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
-msgstr "Širina okna v točkah"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr "Vrednost kakovosti za stiskanje JPEG."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Ni optičnih bralnikov na voljo. Priklopite optični bralnik."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
 msgstr "Z optičnim bralnikom se ni mogoče povezati"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
 msgstr "Optičnega branja ni mogoče začeti"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
 msgstr "Napaka med sporazumevanjem z optičnim bralnikom"
 
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Pokaži podrobnosti različice"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Izpiši razhroščevalna sporočila"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+"Popravi datoteke PDF ustvarjene s starejšimi različicami programa Simple Scan"
+
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
 msgstr "Optično branje je spodletelo"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
 msgstr "Optično bran dokument"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
-msgstr ""
-"Uporaba:\n"
-"  %s [NAPRAVA ...] - Pripomoček optičnega branja"
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[NAPRAVA ...] - pripomoček optičnega branja"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
-#, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
-msgstr ""
-"Možnosti pomoči\n"
-"  -d, --debug Natisne sporočila razhroščevanja\n"
-"  -v, --version Pokaže podrobnosti različice\n"
-"  -h, --help Pokaže možnosti pomoči\n"
-"  --help-all Pokaže vse možnosti pomoči\n"
-"  --help-gtk Pokaže možnosti GTK+"
-
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
-msgstr ""
-"Možnosti GTK+:\n"
-"  --class=CLASS Programski razred uporabljen v upravljalniku oken\n"
-"  --name=NAME Ime programa, ki je uporabljen v upravljalniku oken\n"
-"  --screen=SCREEN Zaslon X za uporabo\n"
-"  --sync Uskladi klice X\n"
-"  --gtk-module=MODULES Naloži dodatnemodule GTK+\n"
-"  --g-fatal-warnings Naredi vsa opozorila usodna"
+msgid "Run '%s --help' to see a full list of available command line options."
+msgstr "Za popoln seznam možnosti ukazne vrstice zaženite '%s --help'."
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "Optično bran dokument.pdf"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Za dostop do '%s' je zahtevano uporabniško ime in geslo"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
 msgstr "Optičnega bralnika ni mogoče zaznati"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
 msgstr "Preverite, če je vaš optični bralnik povezan in vklopljen"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr "PDF (večstranski dokument)"
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr "JPEG (stisnjen)"
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr "PNG (brez izgub)"
-
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
 msgstr "Shrani kot ..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
 msgstr "Slikovne datoteke"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
 msgstr "Vse datoteke"
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
 msgstr "Izberite _vrsto datoteke"
 
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF (večstranski dokument)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (stisnjen)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (brez izgub)"
+
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
 msgstr "Shranjevanje datoteke je spodletelo"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
 msgstr "V primeru, da sprememb ne shranite, bodo trajno izgubljene."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
 msgstr "Naj bo trenutni dokument shranjen?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
 msgstr "Zavrzi vse spremembe"
 
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "Ni bilo mogoče shraniti slike za predogled"
+
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
 msgstr "Ni mogoče odpreti programa predogleda slik"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
 msgstr "Ni mogoče odpreti datoteke pomoči"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -599,78 +623,181 @@ msgstr ""
 "v primeru, da kopije niste prejeli si oglejte <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
 msgstr "O programu"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
 msgstr "Preprosto orodje za optično branje dokumentov"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Andrej Znidarsic https://launchpad.net/~andrej.znidarsic\n"
-"  Klemen Košir https://launchpad.net/~klemen913\n"
+"  Damir Jerovšek https://launchpad.net/~jierro\n"
+"  Klemen Košir https://launchpad.net/~klemen.kosir\n"
 "  Robert Hrovat https://launchpad.net/~robi-hipnos\n"
 "  grofaty https://launchpad.net/~grofaty"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
 msgstr "Ali naj bo dokument pred končanjem programa shranjen?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
 msgstr "Končaj brez shranjevanja"
 
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d točk na palec (privzeto)"
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#: ../src/ui.vala:1292
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d točk na palec (osnutek)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
-#, c-format
-msgid "%d dpi"
-msgstr "%d točk na palec"
-
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d točk na palec (visoka ločljivost)"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
-msgstr "%d točk na palec (privzeto)"
+msgid "%d dpi"
+msgstr "%d točk na palec"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
 msgstr "Datoteke manjkajo"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
 msgstr "Preverite svojo namestitev"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
 msgstr "Spremeni _optični bralnik"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
 msgstr "Samodejno"
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
-msgstr "Optično bran dokument.pdf"
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr "Temenjše"
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr "Svetlejše"
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr "Manj"
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr "Več"
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr "Najmanj"
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr "Največ"
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "Shranjevanje dokumenta ..."
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "Shranjevanje strani %d od %d"
+
+#, c-format
+#~ msgid ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+#~ msgstr ""
+#~ "Možnosti pomoči\n"
+#~ "  -d, --debug Natisne sporočila razhroščevanja\n"
+#~ "  -v, --version Pokaže podrobnosti različice\n"
+#~ "  -h, --help Pokaže možnosti pomoči\n"
+#~ "  --help-all Pokaže vse možnosti pomoči\n"
+#~ "  --help-gtk Pokaže možnosti GTK+"
+
+#~ msgid ""
+#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ msgstr ""
+#~ "Stran strani za optično branje. Lahko je eno od naslednjega: 'obe' 'spredaj' "
+#~ "'zadaj'"
+
+#~ msgid ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ msgstr ""
+#~ "Smer optičnega branja čez optično brano stran. Lahko je ena od naslednjih: "
+#~ "'od-zgoraj-navzdol' 'od-spodaj-navzgor' 'od-leve-proti-desni' 'od-desne-"
+#~ "proti-levi'"
+
+#~ msgid ""
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
+#~ msgstr ""
+#~ "Vrsta optično branega dokumenta. 'besedilo' za dokumente z besedilom, "
+#~ "'fotografije' za fotografije. Ta nastavitev določi ločljivost optičnega "
+#~ "branja, barve in nadaljnje obdvelovanje"
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "Uporaba:\n"
+#~ "  %s [NAPRAVA ...] - Pripomoček optičnega branja"
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "Možnosti GTK+:\n"
+#~ "  --class=CLASS Programski razred uporabljen v upravljalniku oken\n"
+#~ "  --name=NAME Ime programa, ki je uporabljen v upravljalniku oken\n"
+#~ "  --screen=SCREEN Zaslon X za uporabo\n"
+#~ "  --sync Uskladi klice X\n"
+#~ "  --gtk-module=MODULES Naloži dodatnemodule GTK+\n"
+#~ "  --g-fatal-warnings Naredi vsa opozorila usodna"
diff --git a/po/sq.po b/po/sq.po
index 20091bd..bc45e8f 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,536 +7,595 @@ msgid ""
 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-22 23:26+0000\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-07-23 09:08+0000\n"
 "Last-Translator: Alket Rexhepi <alketii@gmail.com>\n"
 "Language-Team: Albanian <sq@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-10-22 04:47+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:44+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Skanim i thjeshtë"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr "A_4"
+msgid "_Document"
+msgstr "_Dokumenti"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr "Sk_anim"
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "Faqe_e_vetme"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:10
 msgid "All Pages From _Feeder"
 msgstr "Të Gjitha Faqet Nga _Ushqyesi"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr "Mbrapa"
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
-msgstr "Prej"
+msgid "_Stop Scan"
+msgstr "_Ndalo Skanimin"
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr "Preje faqen e përzgjedhur"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr "Përball"
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr "Para dhe Mbrapa"
-
-#. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr "Le_gal"
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr "I ri"
-
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr "Përmasa e Faqes:"
+msgid "Text"
+msgstr "Tekst"
 
 #. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
+#: ../data/simple-scan.ui.h:16
 msgid "Photo"
 msgstr "Foto"
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr "Parapëlqimet"
-
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
-msgstr "Rrotullo Majtas"
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr "_Email"
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr "Rrotullo Djathtas"
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr "_Faqe"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
+#: ../data/simple-scan.ui.h:22
 msgid "Rotate _Left"
 msgstr "Rrotullo _Majtas"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
+#: ../data/simple-scan.ui.h:24
 msgid "Rotate _Right"
 msgstr "Rrotullo _Djathtas"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Rrotullo faqen në të majtë"
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "Preje"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Rrotullo faqen në të djathtë"
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "_Asnjë"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
 
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "_Shkronjë"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "Le_gal"
+
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr "Ruaj"
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr "Ruaje dokumentin tek një fajll"
+msgid "_Custom"
+msgstr "_Sipas përdoruesit"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr "Sk_anim"
+msgid "_Rotate Crop"
+msgstr "_Prerje me Rrotullim"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
-msgstr "Skanim"
+msgid "Move Left"
+msgstr "Lëvize Majtas"
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr "Skanoje b_urimin"
+msgid "Move Right"
+msgstr "Lëvize Djathtas"
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr "Skanoje anën"
+msgid "_Help"
+msgstr "_Ndihmë"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
-msgstr "Skanoje një faqe të thjeshtë prej skanerit"
-
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr "Skanim i thjeshtë"
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr "Faqe_e_vetme"
+msgid "_Contents"
+msgstr "_Përmbajtje"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
 msgstr "Filloje një dokument të ri"
 
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "I ri"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "Skanoje një faqe të thjeshtë prej skanerit"
+
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
-msgstr "Ndalo"
+msgid "Scan"
+msgstr "Skanim"
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr "Ruaje dokumentin tek një fajll"
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "Ruaj"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
 msgid "Stop the current scan"
 msgstr "Ndaloje skanimin e tanishëm"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr "Tekst"
-
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr "_Autorizo"
+msgid "Stop"
+msgstr "Ndalo"
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
-msgstr "_Përmbajtje"
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Rrotulloje faqen majtas (kundër akrepave të orës)"
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr "Preje"
+msgid "Rotate Left"
+msgstr "Rrotullo Majtas"
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr "_Sipas përdoruesit"
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Rrotullo faqen në të djathtë"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr "_Dokumenti"
+msgid "Rotate Right"
+msgstr "Rrotullo Djathtas"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "Preje faqen e përzgjedhur"
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
-msgstr "_Email"
+msgid "Crop"
+msgstr "Prej"
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr "_Ndihmë"
+msgid "_Username for resource:"
+msgstr "_Emri i përdoruesit për resursin:"
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr "_Shkronjë"
+msgid "_Password:"
+msgstr "_Fjalëkalim:"
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr "_Asnjë"
+msgid "_Authorize"
+msgstr "_Autorizo"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr "_Faqe"
+msgid "Preferences"
+msgstr "Parapëlqimet"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr "_Fjalëkalim:"
+msgid "Scan S_ource:"
+msgstr "Skanoje b_urimin"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
-msgstr "_Rezolucioni i Fotos:"
+msgid "_Text Resolution:"
+msgstr "_Rezolucioni i Tekstit:"
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr "_Prerje me Rrotullim"
+msgid "_Photo Resolution:"
+msgstr "_Rezolucioni i Fotos:"
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
-msgstr "_Ndalo Skanimin"
+msgid "Scan Side:"
+msgstr "Skanoje anën"
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
-msgstr "_Rezolucioni i Tekstit:"
+msgid "Page Size:"
+msgstr "Përmasa e Faqes:"
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
-msgstr "Shfrytëzuesi për resurse"
+msgid "Brightness:"
+msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
-msgstr "Skanoj Dokumentet"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
-msgstr "Paisje për te skanuar prej"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
-msgstr "Drjetim i skanimit"
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "Para dhe Mbrapa"
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
-msgstr "Vend për ti ruajtur gjërat"
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "Përball"
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
-msgstr "Lartësia e letrës në dhjetat e një mm"
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "Mbrapa"
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr "Lartësia e figurës së skanuar në pixella"
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "Skanoj Dokumentet"
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
-msgstr "Anë e faqes për tu skanuar"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "Gjerësia e dritares në piksel"
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
-msgstr "Rezulucion për skanimet e fotove"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "Lartësia e dritares në piksel"
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
-msgstr "Rezulucion per skanimet e teksteve"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "E VËRTETË nëse dritarja e programit është maksimizuar"
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
-msgstr "Rezulucion i imazhit të fundit të skanuar"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "Paisje për te skanuar prej"
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
-msgstr ""
+msgstr "Pajisja SANE prej të cilës do merren imazhet."
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "Lloji i dokumentit që do të skanohet"
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
+"Tipi i dokumentit që do të skanohet. Ky parametër vendos rezolucionin e "
+"skanimit, ngjyrat dhe pas përpunimin."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "Drjetim i skanimit"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "Drejtimi i skanerit përmes faqes së skanuar."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "Gjerësia e imazhit të skanuar në pikselë"
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
 msgstr ""
+"Gjerësia e imazhit të skanuar në pikselë. Kjo vlerë përditësohet në vlerën e "
+"faqes së fundit."
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "Lartësia e figurës së skanuar në pixella"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
 msgstr ""
+"Lartësia e imazhit të skanuar në pikselë. Kjo vlerë përditësohet sipas faqes "
+"së fundit të skanuar."
 
-#: ../data/simple-scan.schemas.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "Gjerësia e letrës në të dhjetat e mm"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
+"Gjerësia e letrës në të dhjetat e mm (ose 0 për dallim automatik të letrës)."
 
-#: ../data/simple-scan.schemas.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "Lartësia e letrës në dhjetat e një mm"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
 msgstr ""
+"Lartësia e letrës në të dhjetat e mm (ose 0 për dallim automatik të letrës)."
 
-#: ../data/simple-scan.schemas.in.h:17
-msgid "The resolution in dots-per-inch of the previously scanned image."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:19
-msgid "The resolution in dots-per-inch to use when scanning text."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "Rezulucioni i imazhit të fundit të skanuar"
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
+msgid "The resolution in dots-per-inch of the previously scanned image."
+msgstr "Rezolucioni në pika për inç i faqes së mëparshme të skanuar."
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "Rezulucion per skanimet e teksteve"
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "Rezolucioni në pika për inç që do të përdoret kur skanohet tekst."
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "Rezulucion për skanimet e fotove"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "Rezolucioni në pika për inç që do të përdoret kur skanohen foto."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "Anë e faqes për tu skanuar"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "Ana e faqes që do të skanohet."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "Vend për ti ruajtur gjërat"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
+"Drejtoria ku do të ruhen skedarët. Parazgjedhja është drejtoria e "
+"dokumentëve nëse nuk zgjidhet ndonjë tjetër."
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
-msgstr ""
+msgstr "Nuk ka skanera të disponueshëm. Ju lutemi të lidhni një skaner."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
-msgstr ""
+msgstr "Nuk jemi në gjendje të lidhim një skaner"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
-msgstr ""
+msgstr "Nuk munda të nis skanimin"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
+msgstr "Gabim gjatë komunikimit me skanerin"
+
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Shfaq versionin e programit"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Printo mesazhet e gabimeve"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
+"Rregullo skedarët PDF të krijuar nga versione më të vjetra të Skanimit të "
+"Thjeshtë"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
-msgstr ""
+msgstr "Skanimi dështoi"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
-msgstr ""
+msgstr "Dokumenti i Skanuar"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
-msgstr ""
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[DEVICE...] - Mjet i skanimit"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
+msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
+"Nis '%s --ndihmë' për të parë një listë të plotë të linjave të disponueshme "
+"të komandës."
 
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
-#, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
-msgstr ""
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "Dokumenti i Skanuar.pdf"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
-msgstr ""
+msgstr "Emri i përdoruesit dhe skanimi kërkohet për të hyrë në '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
-msgstr ""
+msgstr "Nuk u dalluan skanera"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
-
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr ""
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr ""
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr ""
+"Ju lutemi të kontrolloni nëse skaneri juaj është i lidhur dhe i ndezur"
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
 msgstr "Ruaje Si..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
 msgstr "Kartela Pamje"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
 msgstr "Të Gjithë Skedarët"
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
 msgstr "Zgjidh Llojin e _Skedarit"
 
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF (dokument shumë faqësh)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (i ngjeshur)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (pa humbje)"
+
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
-msgstr ""
+msgstr "Dështuam në ruajtjen e skedarit"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
-msgstr ""
+msgstr "Nëse nuk  ruani, ndryshimet do të humbasin përgjithmonë."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
-msgstr ""
+msgstr "Ta ruaj dokumentin e tanishëm?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
-msgstr ""
+msgstr "Anullo Ndryshimet"
+
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "Nuk jemi në gjendje ta ruajmë imazhin për parapamje"
 
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
-msgstr ""
+msgstr "Nuk jam në gjendje të hap programin për parapamjen e imazhit"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
 msgstr "E pamundur hapja e file të ndihmës"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -551,77 +610,156 @@ msgid ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
+"Ky program është falas: ju mund ta shpërndani atë/ose modifikoni\n"
+"atë nën termat e Liçensës së Përgjithshme Publike të GNU siç publikohet nga\n"
+"Fondacioni i Programeve Falas, si për versionin 3 të liçensës, ose\n"
+"(sipas zgjedhjes suaj) çdo version të mëvonshëm.\n"
+"\n"
+"Ky program shpërndahet me shpresën se do të jetë i dobishëm,\n"
+"por PA ASNJË GARANCI; madje edhe pa garancinë e shprehur se\n"
+"do jetë i TREGTUESHËM apo i PËRSHTATSHËM PËR NJË QËLLIM TË VEÇANTË. Shikoni\n"
+"Liçensën e Përgjithshme Publike GNU për më tepër detaje.\n"
+"\n"
+"Ju duhet të keni marrë një kopje të Liçensës së Përgjithshme Publike të GNU\n"
+"me këtë program. Nëse jo, shikoni <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
-msgstr ""
+msgstr "Rreth Skanimit të Thjeshtë"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
-msgstr ""
+msgstr "Mjet i thjeshtë për skanimin e dokumenteve"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Alket Rexhepi https://launchpad.net/~alketii"
+"  Alket Rexhepi https://launchpad.net/~alketii\n"
+"  Gent Thaçi https://launchpad.net/~gentthaci\n"
+"  Vilson Gjeci https://launchpad.net/~vilsongjeci"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
-msgstr ""
+msgstr "Ta ruaj dokumentin para daljes?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
-msgstr ""
+msgstr "Dil pa e ruajtur"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
 #, c-format
-msgid "%d dpi (draft)"
-msgstr ""
+msgid "%d dpi (default)"
+msgstr "%d dpi (e parazgjedhur)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1292
 #, c-format
-msgid "%d dpi"
-msgstr ""
+msgid "%d dpi (draft)"
+msgstr "%d dpi (i thjeshtë)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
-msgstr ""
+msgstr "%d dpi (rezolucion i lartë)"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
-msgstr ""
+msgid "%d dpi"
+msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
-msgstr ""
+msgstr "Skedarët mungojnë"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
-msgstr ""
+msgstr "Ju lutemi të kontrolloni instalimin tuaj"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
-msgstr ""
+msgstr "Ndrysho _Skanerin"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
+msgstr "Automatik"
+
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
 msgstr ""
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr ""
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr ""
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr ""
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr ""
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
 msgstr ""
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "Ruajtje e dokumentit..."
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "Ruajtja e faqes %d nga %d"
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "Përdorimi:\n"
+#~ "  %s [DEVICE...] - Mjeti skanues"
diff --git a/po/sr.po b/po/sr.po
index 43ac73d..d01c8e7 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,554 +1,604 @@
 # Serbian translation for simple-scan
 # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
 # This file is distributed under the same license as the simple-scan package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
+# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011, 2012.
 msgid ""
 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-01-26 22:27+0000\n"
-"Last-Translator: Launchpad Translations Administrators "
-"<rosetta@launchpad.net>\n"
-"Language-Team: Serbian <sr@li.org>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-10-30 08:48+0000\n"
+"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
+"Language-Team: Serbian translators\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-22 04:48+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
+"Language: sr\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Обично скенирање"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr "A_4"
+msgid "_Document"
+msgstr "_Документ"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr "С_кенирај"
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "Једну _страницу"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:10
 msgid "All Pages From _Feeder"
 msgstr "Све странице из _фиоке"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr ""
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
-msgstr ""
+msgid "_Stop Scan"
+msgstr "_Заустави скенирање"
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr ""
+msgid "Text"
+msgstr "Текст"
 
-#. Combo box label for scanning the front side of a page
+#. Combo box label for photo scan mode
 #: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr ""
+msgid "Photo"
+msgstr "Слика"
 
-#. Combo box label for scanning both sides of a page
+#. Label on email menu item
 #: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr ""
+msgid "_Email"
+msgstr "_Ел. пошта"
 
-#. Radio button for cropping to page to US legal size
+#. Page menu (contains action for each page, e.g. delete, crop)
 #: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr "Америчко писмо"
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr ""
+msgid "_Page"
+msgstr "_Страница"
 
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr ""
+#. Menu item to rotate page to left (anti-clockwise)
+#: ../data/simple-scan.ui.h:22
+msgid "Rotate _Left"
+msgstr "Окрени на _лево"
 
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
-msgid "Photo"
-msgstr "Слика"
+#. Menu item to rotate page to right (clockwise)
+#: ../data/simple-scan.ui.h:24
+msgid "Rotate _Right"
+msgstr "Окрени на _десно"
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr "Подешавања"
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "_Опсеци"
 
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
-msgstr ""
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "_Ништа"
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr ""
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "А_4"
 
-#. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
-msgid "Rotate _Left"
-msgstr "Ротирај _лево"
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "А_5"
 
-#. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
-msgid "Rotate _Right"
-msgstr "Ротирај _десно"
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "А_6"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr ""
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "_Америчко писмо"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr ""
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "_Легал"
 
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr ""
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr ""
+msgid "_Custom"
+msgstr "_Произвољно"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr ""
+msgid "_Rotate Crop"
+msgstr "_Ротирај опсечено"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
-msgstr ""
+msgid "Move Left"
+msgstr "Помери лево"
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr "Извор скенирања"
+msgid "Move Right"
+msgstr "Помери десно"
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr ""
+msgid "_Help"
+msgstr "По_моћ"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
-msgstr ""
-
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr "Обично скенирање"
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr "Једна _страна"
+msgid "_Contents"
+msgstr "_Садржај"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
-msgstr ""
+msgstr "Покрените нови документ"
 
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "Нова"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "Скенирајте једну страницу са скенера"
+
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
-msgstr ""
+msgid "Scan"
+msgstr "Скенирај"
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
-msgid "Stop the current scan"
-msgstr ""
+msgid "Save document to a file"
+msgstr "Сачувајте документ у датотеку"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr "Текст"
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "Сачувај"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
+msgid "Stop the current scan"
+msgstr "Зауставите текуће скенирање"
 
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr "О_власти"
+msgid "Stop"
+msgstr "Заустави"
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
-msgstr ""
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Окрените страну на лево (супротно смеру казаљке на сату)"
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr "_Исеци"
+msgid "Rotate Left"
+msgstr "Окрени на лево"
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr "_Кориснички"
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Окрените страну на десно (у смеру казаљке на сату)"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr "_Документ"
+msgid "Rotate Right"
+msgstr "Окрени на десно"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "Одрежите изабрану страну"
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
-msgstr ""
+msgid "Crop"
+msgstr "Одрежи"
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr "_Помоћ"
+msgid "_Username for resource:"
+msgstr "_Корисничко име за извор:"
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr "_Летер"
+msgid "_Password:"
+msgstr "_Лозинка:"
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr "_Ништа"
+msgid "_Authorize"
+msgstr "О_власти"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr "_Страна"
+msgid "Preferences"
+msgstr "Подешавања"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr "_Лозинка:"
+msgid "Scan S_ource:"
+msgstr "Извор _скенирања:"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
-msgstr ""
+msgid "_Text Resolution:"
+msgstr "Резолуција _текста:"
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr "Ротирај осечено"
+msgid "_Photo Resolution:"
+msgstr "Ре_золуција слике:"
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
-msgstr ""
+msgid "Scan Side:"
+msgstr "Странице за скенирање:"
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
-msgstr ""
+msgid "Page Size:"
+msgstr "Величина странице:"
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
-msgstr "_Корисничко име за извор:"
-
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
+msgid "Brightness:"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
-msgstr ""
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "Наличје и позадина"
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
-msgstr ""
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "Наличје"
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr ""
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "Позадина"
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
-msgstr ""
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "Скенирајте документе"
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "Ширина прозора у тачкама"
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "Висина прозора у тачкама"
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "ТАЧНО ако је прозор програма увећан"
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "Уређај из ког ће се скенирати"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
-msgstr ""
+msgstr "САНЕ уређај из ког ће се унети слике."
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "Врста документа који ће бити скениран"
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
+"Врста документа који ће бити скениран. Ово подешавање одлучује о резолуцији, "
+"бојама и завршној обради скенирања."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "Правац скенирања"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "Усмерење скенера преко скениране странице."
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "Ширина скениране слике у тачкама"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
 msgstr ""
+"Ширина скениране слике у тачкама. Ова вредност се аутоматски поставља на "
+"величину последње скениране странице."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "Висина скениране слике у тачкама"
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 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
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "Ширина папира у десетом делу милиметра"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
+"Ширина папира у десетом делу милиметра (или 0 за аутоматско откривање "
+"папира)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "Висина папира у десетом делу милиметра"
 
-#: ../data/simple-scan.schemas.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
 msgstr ""
+"Висина папира у десетом делу милиметра (или 0 за аутоматско откривање "
+"папира)."
 
-#: ../data/simple-scan.schemas.in.h:17
-msgid "The resolution in dots-per-inch of the previously scanned image."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:19
-msgid "The resolution in dots-per-inch to use when scanning text."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "Резолуција последње скениране слике"
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
+msgid "The resolution in dots-per-inch of the previously scanned image."
+msgstr "Резолуција у тачкама-по-инчу (dpi) претходно скениране слике."
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "Резолуција за скенирања текста"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
+"Резолуција у тачкама-по-инчу (dpi) која ће бити коришћена при скенирању "
+"текста."
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "Резолуција за скенирања слика"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
+"Резолуција у тачкама-по-инчу (dpi) која ће бити коришћена при скенирању "
+"фотографија."
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "Страна странице за скенирање"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "Страна странице за скенирање."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "Директоријум за чување датотека"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
+"Директоријум у коме ће бити сачуване датотеке. Ако није постављено онда је "
+"то основни директоријум докумената."
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
-msgstr ""
+msgstr "Нема доступних скенера. Молим прикључите скенер."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
-msgstr "Није могуће повезати се са скенером"
+msgstr "Не могу да се повежем са скенером"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
-msgstr "Није могуће започети скенирање"
+msgstr "Не могу да започнем скенирање"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
 msgstr "Грешка у коминикацији са скенером"
 
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Приказује издање програма"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Исписује поруке за отклањање грешака"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+"Поправи ПДФ датотеке створене старијим издањима Једноставног скенирања"
+
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
-msgstr "Грешка у скенирању"
+msgstr "Нисам успео да скенирам"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
-msgstr ""
+msgstr "Скенирани документ"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
-msgstr ""
-"Коришћење:\n"
-"  %s [DEVICE...] - алатка за скенирање"
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[УРЕЂАЈ...] — алатка за скенирање"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
+msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
+"Покрените „%s --help“ за потпуни списак свих опција из командне линије."
 
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
-#, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
-msgstr ""
-"Гтк+ опције:\n"
-"  --class=CLASS                   Класа програма коју користи управљач "
-"прозора\n"
-"  --name=NAME                     Име програма како га приказује управљач "
-"прозора\n"
-"  --screen=SCREEN                 Икс екран који да користи\n"
-"  --sync                          Поставља Икс позиве синхроним\n"
-"  --gtk-module=MODULES            Учитава допунске Гтк+ додатке\n"
-"  --g-fatal-warnings              Поставља сва упозорења као кобна"
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "Скенирани документ.pdf"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
-msgstr "Корисничко име и лозинка су обавезни за приступ '%s'"
+msgstr "Корисничко име и лозинка су обавезни за приступ „%s“"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
-msgstr "Нема препознатих скенера"
+msgstr "Нема откривених скенера"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
 msgstr "Проверите да ли је скенер повезан и укључен"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr ""
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr ""
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr ""
-
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
 msgstr "Сачувај као..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
-msgstr ""
+msgstr "Датотеке слика"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
-msgstr ""
+msgstr "Све датотеке"
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
-msgstr ""
+msgstr "_Изаберите врсту датотеке"
+
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "ПДФ (документ са више страна)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "ЈПЕГ (сажето)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "ПНГ (без губитака)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
-msgstr "Грешка у снимању датотеке"
+msgstr "Нисам успео да сачувам датотеку"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
-msgstr ""
+msgstr "Уколико не сачувате, измене ће бити трајно изгубљене."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
-msgstr ""
+msgstr "Да сачувам текући документ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
-msgstr ""
+msgstr "Одбаци измене"
+
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "Не могу да сачувам слику за преглед"
 
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
-msgstr ""
+msgstr "Не могу да отворим програм за приказивање слика"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
-msgstr ""
+msgstr "Не могу да отворим датотеку помоћи"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -563,89 +613,199 @@ msgid ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
-"Овај програм је слободан софтвер: можете делити  и/или мењати\n"
-"под условима ГНУ-ове опште јавне лиценце коју је објавила\n"
-"Задужбина за слободни софтвер, било верзије 3 лиценце, или\n"
-"(по вашем избору) било које касније верзије.\n"
+"Овај програм је слободан софтвер: можете га делити и/или\n"
+"мењати под условима ГНУ-ове Опште јавне лиценце коју је\n"
+"објавила Задужбина слободног софтвера, било верзије 3\n"
+"лиценце, или (по вашем избору) било које новије верзије.\n"
 "\n"
-"Овај програм је дистрибуиран у нади да ће бити користан,\n"
-"али БЕЗ БИЛО КАКВЕ ГАРАНЦИЈЕ, чак и без подразумеване гаранције за\n"
-"ПРОДАЈУ или ПРИЛАГОЂАВАЊЕ ЗА ОДРЕЂЕНЕ ПОТРЕБЕ. Погледајте\n"
-"ГНУ Општу јавну лиценцу за више детаља.\n"
+"Овај програм се расподељује у нади да ће бити користан,\n"
+"али БЕЗ ИКАКВЕ ГАРАНЦИЈЕ, чак и без примењене гаранције\n"
+"ТРЖИШНЕ ВРЕДНОСТИ или ПРИЛАГОЂЕНОСТИ ОДРЕЂЕНОЈ НАМЕНИ.\n"
+"Погледајте ГНУ Општу јавну лиценцу за више детаља.\n"
 "\n"
-"Требало би да сте примили копију ГНУ Опште јавне лиценце\n"
-"заједно са овим програмом. Ако не, види <http://www.gnu.org/licenses/>."
+"Требали сте да примите примерак ГНУ Опште јавне лиценце\n"
+"уз овај програм. Ако нисте, погледајте:\n"
+"http://www.gnu.org/licenses/."
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
-msgstr "О Једноставно скенирање"
+msgstr "О Једноставном скенирању"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
-msgstr "Алатка за једноставно скенирање докумената"
+msgstr "Једноставна алатка за скенирање докумената"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Ivan Petrovic https://launchpad.net/~ivanpetrovic"
+"  Ivan Petrovic https://launchpad.net/~ivanpetrovic\n"
+"  Kosava https://launchpad.net/~kosava\n"
+"  Launchpad Translations Administrators https://launchpad.net/~rosetta\n"
+"  Michael Hoth https://launchpad.net/~hoth-einbeck\n"
+"  Марко М. Костић https://launchpad.net/~marko-m-kostic\n"
+"  Мирослав Николић https://launchpad.net/~lipek"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
-msgstr ""
+msgstr "Да сачувам документ пре него што изађем?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
-msgstr ""
+msgstr "Изађи без чувања"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
 #, c-format
-msgid "%d dpi (draft)"
-msgstr ""
+msgid "%d dpi (default)"
+msgstr "%d тпи (основно)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1292
 #, c-format
-msgid "%d dpi"
-msgstr ""
+msgid "%d dpi (draft)"
+msgstr "%d тпи (нацрт)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
-msgstr ""
+msgstr "%d тпи (висока резолуција)"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
-msgstr ""
+msgid "%d dpi"
+msgstr "%d тпи"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
 msgstr "Недостају датотеке"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
 msgstr "Проверите вашу инсталацију"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
-msgstr ""
+msgstr "Промени _скенер"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
+msgstr "Самостално"
+
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
 msgstr ""
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
-msgstr "Скенирани документ.pdf"
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr ""
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr ""
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr ""
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr ""
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr ""
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "Чувам документ..."
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "Чувам страницу %d од укупно %d странице"
+
+#~ msgid ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ msgstr ""
+#~ "Усмерење скенера преко скениране странице. Може бити једна од следећих "
+#~ "вредности: „top-to-bottom“ (одозго-на-доле), „bottom-to-top“ (одоздо-на-"
+#~ "горе), „left-to-right“ (слева-на-десно) или „right-to-left“ (сдесна-на-лево)."
+
+#~ msgid ""
+#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ msgstr ""
+#~ "Страна странице за скенирање. Може бити једна од следећих вредности: „both“ "
+#~ "(обе), „front“ (наличје) или „back“ (позадина)."
+
+#~ msgid ""
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
+#~ msgstr ""
+#~ "Врста документа који ће бити скениран. „text“ (текст) за документа, „photo“ "
+#~ "(фотографија) за фотографије. Ово подешавање одлучује о резолуцији, бојама и "
+#~ "завршној обради скенирања."
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "Коришћење:\n"
+#~ "  %s [УРЕЂАЈ...] — алатка за скенирање"
+
+#, c-format
+#~ msgid ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+#~ msgstr ""
+#~ "Опције помоћи:\n"
+#~ "  -d, --debug                     Исписује поруке за исправљање грешака\n"
+#~ "  -v, --version                   Исписује издање програма\n"
+#~ "  -h, -?, --help                  Приказује опције помоћи\n"
+#~ "  --help-all                      Приказује све опције помоћи\n"
+#~ "  --help-gtk                      Приказује Гтк+ опције"
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "Гтк+ опције:\n"
+#~ "  --class=CLASS                   Класа програма коју користи управљач "
+#~ "прозора\n"
+#~ "  --name=NAME                     Име програма које користи управљач "
+#~ "прозора\n"
+#~ "  --screen=SCREEN                 Икс екран за коришћење\n"
+#~ "  --sync                          Усаглашава позиве Икса\n"
+#~ "  --gtk-module=MODULES            Учитава допунске Гтк+ модуле\n"
+#~ "  --g-fatal-warnings              Чини сва упозорења кобним"
diff --git a/po/sv.po b/po/sv.po
index 0ed4652..ae4f4de 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,326 +7,347 @@ msgid ""
 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-06 06:05+0000\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-07-23 09:08+0000\n"
 "Last-Translator: Daniel Nylander <yeager@ubuntu.com>\n"
 "Language-Team: Swedish <sv@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-10-22 04:48+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Enkel bildinläsning"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr "A_4"
+msgid "_Document"
+msgstr "_Dokument"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr "Läs _in"
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "Enkel _sida"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:10
 msgid "All Pages From _Feeder"
 msgstr "Alla sidor från _matare"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr "Baksida"
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
-msgstr "Beskär"
+msgid "_Stop Scan"
+msgstr "_Stoppa inläsning"
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr "Beskär den valda sidan"
+msgid "Text"
+msgstr "Text"
 
-#. Combo box label for scanning the front side of a page
+#. Combo box label for photo scan mode
 #: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr "Framsida"
+msgid "Photo"
+msgstr "Foto"
 
-#. Combo box label for scanning both sides of a page
+#. Label on email menu item
 #: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr "Fram- och baksida"
+msgid "_Email"
+msgstr "_E-post"
 
-#. Radio button for cropping to page to US legal size
+#. Page menu (contains action for each page, e.g. delete, crop)
 #: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr "Le_gal"
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr "Ny"
+msgid "_Page"
+msgstr "_Sida"
 
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr "Sidstorlek:"
+#. Menu item to rotate page to left (anti-clockwise)
+#: ../data/simple-scan.ui.h:22
+msgid "Rotate _Left"
+msgstr "Rotera åt _vänster"
 
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
-msgid "Photo"
-msgstr "Foto"
+#. Menu item to rotate page to right (clockwise)
+#: ../data/simple-scan.ui.h:24
+msgid "Rotate _Right"
+msgstr "Rotera åt _höger"
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr "Inställningar"
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "_Beskär"
 
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
-msgstr "Rotera åt vänster"
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "_Ingen"
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr "Rotera åt höger"
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
 
-#. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
-msgid "Rotate _Left"
-msgstr "Rotera _vänster"
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
 
-#. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
-msgid "Rotate _Right"
-msgstr "Rotera _höger"
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Rotera sidan åt vänster (motsols)"
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "_Letter"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Rotera sidan åt höger (medsols)"
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "Le_gal"
 
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr "Spara"
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr "Spara dokument till en fil"
+msgid "_Custom"
+msgstr "An_passad"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr "Läs _in"
+msgid "_Rotate Crop"
+msgstr "_Rotera beskär"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
-msgstr "Läs in"
+msgid "Move Left"
+msgstr ""
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr "Inläsnings_källa:"
+msgid "Move Right"
+msgstr ""
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr "Inläsningssida:"
+msgid "_Help"
+msgstr "_Hjälp"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
-msgstr "Läs in en enstaka sida från bildläsaren"
-
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr "Enkel bildinläsning"
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr "Enkel _sida"
+msgid "_Contents"
+msgstr "_Innehåll"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
 msgstr "Starta ett nytt dokument"
 
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "Nytt"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "Läs in en enstaka sida från bildläsaren"
+
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
-msgstr "Stoppa"
+msgid "Scan"
+msgstr "Läs in"
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr "Spara dokument till en fil"
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "Spara"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
 msgid "Stop the current scan"
 msgstr "Stoppa den aktuella bildinläsningen"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr "Text"
-
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr "A_uktorisera"
+msgid "Stop"
+msgstr "Stoppa"
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
-msgstr "_Innehåll"
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Rotera sidan åt vänster (motsols)"
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr "_Beskär"
+msgid "Rotate Left"
+msgstr "Rotera åt vänster"
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr "An_passad"
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Rotera sidan åt höger (medsols)"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr "_Dokument"
+msgid "Rotate Right"
+msgstr "Rotera åt höger"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "Beskär den valda sidan"
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
-msgstr "_E-post"
+msgid "Crop"
+msgstr "Beskär"
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr "_Hjälp"
+msgid "_Username for resource:"
+msgstr "_Användarnamn för källa:"
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr "_Letter"
+msgid "_Password:"
+msgstr "_Lösenord:"
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr "_Ingen"
+msgid "_Authorize"
+msgstr "A_uktorisera"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr "_Sida"
+msgid "Preferences"
+msgstr "Inställningar"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr "_Lösenord:"
+msgid "Scan S_ource:"
+msgstr "Inläsnings_källa:"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
-msgstr "_Fotoupplösning:"
+msgid "_Text Resolution:"
+msgstr "_Textupplösning:"
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr "_Rotera beskär"
+msgid "_Photo Resolution:"
+msgstr "_Fotoupplösning:"
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
-msgstr "_Stoppa inläsning"
+msgid "Scan Side:"
+msgstr "Inläsningssida:"
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
-msgstr "_Textupplösning:"
+msgid "Page Size:"
+msgstr "Sidstorlek:"
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
-msgstr "_Användarnamn för källa:"
+msgid "Brightness:"
+msgstr "Ljusstyrka:"
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
-msgstr "Läs in dokument"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr "Kontrast:"
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
-msgstr "Enhet att läsa in från"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
-msgstr "Riktning för inläsning"
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "Fram- och baksida"
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
-msgstr "Katalog att spara filer i"
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "Framsida"
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
-msgstr "Höjd på pappret i tiondels millimeter"
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "Baksida"
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr "Höjd för den inlästa bilden i bildpunkter"
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "Läs in dokument"
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
-msgstr "Sida att läsa in"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "Fönsterbredd i bildpunkter"
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
-msgstr "Upplösning för fotoinläsningar"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "Fönsterhöjd i bildpunkter"
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
-msgstr "Upplösning för textinläsningar"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "TRUE om programfönstret är maximerat"
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
-msgstr "Upplösning för senaste inlästa bild"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "Enhet att läsa in från"
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
 msgstr "SANE-enhet att hämta in bilder från."
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
-msgstr "TRUE om programfönstret är maximerat"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "Typ av dokument som ska läsas in"
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
-"Riktningen för bildläsaren över den inlästa sidan. Det kan vara en av "
-"följande: \"top-to-bottom\" \"bottom-to-top\" \"left-to-right\" \"right-to-"
-"left\""
+"Typ av dokument att läsa in. Denna inställning bestämmer inläsningens "
+"upplösning, färger och efterbehandling."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "Riktning för inläsning"
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "Riktningen för bildläsaren över den inlästa sidan."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "Bredd för den inlästa bilden i bildpunkter"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
 msgstr ""
-"Katalogen att spara filer i. Standardvärdet är dokumentkatalogen om den inte "
-"är inställd."
+"Bredd för den inlästa bilden i bildpunkter.  Detta värde uppdateras till vad "
+"som senaste inlästa bilden använde."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "Höjd för den inlästa bilden i bildpunkter"
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
@@ -334,243 +355,246 @@ msgstr ""
 "Höjd för den inlästa bilden i bildpunkter.  Detta värde uppdateras till vad "
 "som senaste inlästa bilden använde."
 
-#: ../data/simple-scan.schemas.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "Bredd på pappret i tiondels millimeter"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
-"Höjd på pappret i tiondels millimeter (eller 0 för automatisk "
+"Bredd på pappret i tiondels millimeter (eller 0 för automatisk "
 "pappersidentifiering)."
 
-#: ../data/simple-scan.schemas.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "Höjd på pappret i tiondels millimeter"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
 msgstr ""
-"Sidan att läsa in. Det kan vara en av följande: \"both\" \"front\" \"back\""
+"Höjd på pappret i tiondels millimeter (eller 0 för automatisk "
+"pappersidentifiering)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr "Ljusstyrka i skanningen"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Instöllningen av ljusstyrkan från -100 till 100 (0 betyder ingen)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr "Kontrasten på skanningen"
 
-#: ../data/simple-scan.schemas.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Inställningen av kontrast från -100 till 100 (0 betyder ingen)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "Upplösning för senaste inlästa bild"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
 msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr "Upplösningen i punkter per tum för den föregående inlästa bilden."
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "Upplösningen i punkter per tum att använda när foton läses in."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "Upplösning för textinläsningar"
 
-#: ../data/simple-scan.schemas.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "Upplösning i punkter per tum att använda när text läses in."
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"Bredd för den inlästa bilden i bildpunkter.  Detta värde uppdateras till vad "
-"som senaste inlästa bilden använde."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "Upplösning för fotoinläsningar"
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Bredd på pappret i tiondels millimeter (eller 0 för automatisk "
-"pappersidentifiering)."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "Upplösningen i punkter per tum att använda när foton läses in."
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
-msgstr "Typ av dokument som ska läsas in"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "Sida att läsa in"
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
-msgstr ""
-"Typ av dokument som läses in. \"text\" för textdokument, \"photo\" för "
-"foton. Denna inställning bestämmer inläsningens upplösning, färger och "
-"efterbehandling."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "Papprets sida att läsa in."
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
-msgstr "Bredd på pappret i tiondels millimeter"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "Katalog att spara filer i"
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
-msgstr "Bredd för den inlästa bilden i bildpunkter"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Katalogen att spara filer i. Standardvärdet är dokumentkatalogen om den inte "
+"är inställd."
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
-msgstr "Fönsterhöjd i bildpunkter"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
-msgstr "Fönsterbredd i bildpunkter"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Inga bildläsare finns tillgängliga. Anslut en bildläsare."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
 msgstr "Kan inte ansluta till bildläsare"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
 msgstr "Kan inte starta inläsning"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
 msgstr "Fel i kommunikation med bildläsare"
 
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Visa utgåvans version"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Skriv ut felsökningsmeddelanden"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr "Laga PDF-filer som skapades med äldre versioner av Simple Scan"
+
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
 msgstr "Misslyckades med att läsa in"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
 msgstr "Inläst dokument"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
-msgstr ""
-"Användning:\n"
-"  %s [ENHET...] - Inläsningsverktyg"
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[ENHET...] - Bildinläsningsverktyg"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
+msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
-"Hjälpflaggor:\n"
-"  -d, --debug                     Skriv ut felsökningsmeddelanden\n"
-"  -v, --version                   Visa utgåvans version\n"
-"  -h, --help                      Visa hjälpflaggor\n"
-"  --help-all                      Visa alla hjälpflaggor\n"
-"  --help-gtk                      Visa GTK+-flaggor"
-
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
-#, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
-msgstr ""
-"GTK+-flaggor:\n"
-"  --class=KLASS                   Programklass som används av "
-"fönsterhanteraren\n"
-"  --name=NAMN                     Programnamn som används av "
-"fönsterhanteraren\n"
-"  --screen=SKÄRM                  X-skärm att använda\n"
-"  --sync                          Gör X-anrop synkrona\n"
-"  --gtk-module=MODULER            Läs in ytterligare GTK+-moduler\n"
-"  --g-fatal-warnings              Gör alla varningar ödesdigra"
+"Kör \"%s --help\" för en komplett lista över tillgängliga "
+"kommandoradsflaggor."
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "Inläst dokument.pdf"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Användarnamn och lösenord krävs för åtkomst till \"%s\""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
 msgstr "Inga bildinläsare hittades"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
 msgstr "Kontrollera att din bildläsare är ansluten och påslagen"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr "PDF (flersidigt dokument)"
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr "JPEG (komprimerad)"
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr "PNG (förlustfri)"
-
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
 msgstr "Spara som..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
 msgstr "Bildfiler"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
 msgstr "Alla filer"
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
 msgstr "Välj fil_typ"
 
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF (flersidigt dokument)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (komprimerad)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (förlustfri)"
+
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
 msgstr "Misslyckades med att spara filen"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Om du inte sparar så kommer ändringarna att gå förlorade."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
 msgstr "Spara aktuellt dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
 msgstr "Förkasta ändringar"
 
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "Kunde inte spara bild för förhandsvisning"
+
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
 msgstr "Kunde inte öppna förhandsvisningsprogrammet för bilder"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
 msgstr "Kunde inte öppna hjälpfilen"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -600,78 +624,187 @@ msgstr ""
 "med detta program. Om inte, se <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
 msgstr "Om Enkel bildinläsning"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
 msgstr "Enkelt verktyg för inläsning av dokument"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Anders Pamdal https://launchpad.net/~anders-pamdal\n"
+"  Arve Eriksson https://launchpad.net/~031299870-telia\n"
 "  Daniel Nylander https://launchpad.net/~yeager\n"
 "  Jens Askengren https://launchpad.net/~jens-askengren\n"
-"  Teodor Jönsson https://launchpad.net/~teodor-jonsson-sogeti"
+"  Peter Ahlgren https://launchpad.net/~peter.ahlgren\n"
+"  Simba https://launchpad.net/~the-funnyboy\n"
+"  Simon Hammarström https://launchpad.net/~simmeson\n"
+"  Teodor Jönsson https://launchpad.net/~teodor-jonsson-sogeti-"
+"deactivatedaccount\n"
+"  Zahirovic Mensur https://launchpad.net/~nookienoq"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
 msgstr "Spara dokumment innan du avslutar?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
 msgstr "Avsluta utan att spara"
 
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (standard)"
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#: ../src/ui.vala:1292
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (utkast)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
-#, c-format
-msgid "%d dpi"
-msgstr "%d dpi"
-
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (hög upplösning)"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
-msgstr "%d dpi (standard)"
+msgid "%d dpi"
+msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
 msgstr "Filer saknas"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
 msgstr "Kontrollera din installation"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
 msgstr "Byt _bildinläsare"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
 msgstr "Automatiskt"
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
-msgstr "Inläst dokument.pdf"
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr "Mörkare"
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr "Ljusare"
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr "Mindre"
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr "Mer"
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr ""
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr ""
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "Sparar dokument..."
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "Sparar sida %d av %d"
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "Användning:\n"
+#~ "  %s [ENHET...] - Inläsningsverktyg"
+
+#, c-format
+#~ msgid ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+#~ msgstr ""
+#~ "Hjälpflaggor:\n"
+#~ "  -d, --debug                     Skriv ut felsökningsmeddelanden\n"
+#~ "  -v, --version                   Visa utgåvans version\n"
+#~ "  -h, --help                      Visa hjälpflaggor\n"
+#~ "  --help-all                      Visa alla hjälpflaggor\n"
+#~ "  --help-gtk                      Visa GTK+-flaggor"
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "GTK+-flaggor:\n"
+#~ "  --class=KLASS                   Programklass som används av "
+#~ "fönsterhanteraren\n"
+#~ "  --name=NAMN                     Programnamn som används av "
+#~ "fönsterhanteraren\n"
+#~ "  --screen=SKÄRM                  X-skärm att använda\n"
+#~ "  --sync                          Gör X-anrop synkrona\n"
+#~ "  --gtk-module=MODULER            Läs in ytterligare GTK+-moduler\n"
+#~ "  --g-fatal-warnings              Gör alla varningar ödesdigra"
+
+#~ msgid ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ msgstr ""
+#~ "Riktningen för bildläsaren över den inlästa sidan. Det kan vara en av "
+#~ "följande: \"top-to-bottom\" \"bottom-to-top\" \"left-to-right\" \"right-to-"
+#~ "left\""
+
+#~ msgid ""
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
+#~ msgstr ""
+#~ "Typ av dokument som läses in. \"text\" för textdokument, \"photo\" för "
+#~ "foton. Denna inställning bestämmer inläsningens upplösning, färger och "
+#~ "efterbehandling."
+
+#~ msgid ""
+#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ msgstr ""
+#~ "Sidan att läsa in. Det kan vara en av följande: \"both\" \"front\" \"back\""
diff --git a/po/te.po b/po/te.po
index 1e8dfea..da0740c 100644
--- a/po/te.po
+++ b/po/te.po
@@ -7,537 +7,591 @@ msgid ""
 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-01-26 22:27+0000\n"
-"Last-Translator: Launchpad Translations Administrators "
-"<rosetta@launchpad.net>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-07-23 09:08+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Telugu <te@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-10-22 04:48+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr ""
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "సింపుల్ స్కాన్"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr ""
+msgid "_Document"
+msgstr "పత్రం (_D)"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr ""
+msgid "Sc_an"
+msgstr "స్కాన్(_a)"
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr ""
+msgid "Single _Page"
+msgstr "ఒక పేజీ(_P)"
 
 #. 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 "ఫీడర్ నుండి అన్ని పేజీలు(_F)"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr ""
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
-msgstr ""
+msgid "_Stop Scan"
+msgstr "స్కాన్ ఆపు(_S)"
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr ""
+msgid "Text"
+msgstr "పాఠ్యం"
 
-#. Combo box label for scanning the front side of a page
+#. Combo box label for photo scan mode
 #: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr ""
+msgid "Photo"
+msgstr "ఫొటో"
 
-#. Combo box label for scanning both sides of a page
+#. Label on email menu item
 #: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr ""
+msgid "_Email"
+msgstr "ఈమెయిల్(_E)"
 
-#. Radio button for cropping to page to US legal size
+#. Page menu (contains action for each page, e.g. delete, crop)
 #: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr ""
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr ""
+msgid "_Page"
+msgstr "పేజీ(_P)"
 
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr ""
+#. Menu item to rotate page to left (anti-clockwise)
+#: ../data/simple-scan.ui.h:22
+msgid "Rotate _Left"
+msgstr "ఎడమవైపు తిప్పు (_L)"
 
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
-msgid "Photo"
-msgstr "ఫొటో"
+#. Menu item to rotate page to right (clockwise)
+#: ../data/simple-scan.ui.h:24
+msgid "Rotate _Right"
+msgstr "కుడివైపు తిప్పు(_R)"
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr "అభిరుచులు"
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "క్రాప్ చేయి(_C)"
 
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
-msgstr ""
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "ఏదీకాదు(_N)"
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr ""
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
 
-#. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
-msgid "Rotate _Left"
-msgstr ""
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
 
-#. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
-msgid "Rotate _Right"
-msgstr ""
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr ""
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "లెటర్ (_L)"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr ""
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "లీగల్ (_g)"
 
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr ""
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr ""
+msgid "_Custom"
+msgstr "మలచుకొను(_C)"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr ""
+msgid "_Rotate Crop"
+msgstr "క్రాప్‌చేసినదానిని తిప్పు(_R)"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
-msgstr ""
+msgid "Move Left"
+msgstr "ఎడమకు జరుపు"
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr ""
+msgid "Move Right"
+msgstr "కుడి వైపు జరుపు"
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr ""
+msgid "_Help"
+msgstr "సహాయం (_H)"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
-msgstr ""
-
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr ""
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr ""
+msgid "_Contents"
+msgstr "విషయసూచిక(_C)"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
-msgstr ""
+msgstr "ఒక కొత్త పత్రాన్ని ప్రాంరంభించు"
 
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "కొత్త"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "స్కానర్ నుండి ఒకే ఒక పేజీ స్కాన్ చేయి"
+
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
-msgstr ""
+msgid "Scan"
+msgstr "స్కాన్"
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
-msgid "Stop the current scan"
-msgstr ""
+msgid "Save document to a file"
+msgstr "పత్రాన్ని ఫైలులో దాచు"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr "పాఠ్యం"
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "భద్రపరచు"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
+msgid "Stop the current scan"
+msgstr "ప్రస్తుత స్కాన్ ఆపు"
 
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr ""
+msgid "Stop"
+msgstr "ఆపు"
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
-msgstr ""
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "ఎడమవైపుకు త్రిప్పు (అపసవ్య)"
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr ""
+msgid "Rotate Left"
+msgstr "ఎడమవైపు తిప్పు"
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr ""
+msgid "Rotate the page to the right (clockwise)"
+msgstr "కుడి వైపుకు త్రిప్పు (సవ్య)"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr ""
+msgid "Rotate Right"
+msgstr "కుడివైపు తిప్పు"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "ఎంపికైన పెజీ అంచులుసవరించు"
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
-msgstr ""
+msgid "Crop"
+msgstr "అంచులుసవరించు"
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr "సహాయం (_H)"
+msgid "_Username for resource:"
+msgstr "వనరుకు వాడుకరిపేరు(_U):"
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr ""
+msgid "_Password:"
+msgstr "సంకేతపదం(_P):"
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr ""
+msgid "_Authorize"
+msgstr "అధికారమిచ్చు(_A)"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr ""
+msgid "Preferences"
+msgstr "ప్రాధాన్యతలు"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr "సంకేతపదం (_P):"
+msgid "Scan S_ource:"
+msgstr "స్కాన్ మూలం (_o):"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
-msgstr ""
+msgid "_Text Resolution:"
+msgstr "పాఠ విభాజకత (_T)"
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr ""
+msgid "_Photo Resolution:"
+msgstr "ఫొటో విభాజకత(_P)"
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
-msgstr ""
+msgid "Scan Side:"
+msgstr "స్కాన్ చేయు ప్రక్క:"
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
-msgstr ""
+msgid "Page Size:"
+msgstr "పేజీ పరిమాణం:"
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
+msgid "Brightness:"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
-msgstr ""
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "ముందు మరియు వెనుక"
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
-msgstr ""
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "ముందుభాగం"
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
-msgstr ""
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "వెనుకకు"
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr ""
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "పత్రాలు స్కాన్ చేయు"
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "విండో వెడల్పు పిక్సెళ్ళలో"
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "విండో ఎత్తు పిక్సెళ్ళలో"
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "TRUE అనువర్తనం విండో గరిష్ఠ పరిమాణంలో చూపబడుతున్నట్లైతే"
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "స్కాన్ చేయుటకు పరికరం"
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
-msgstr ""
+msgstr "బొమ్మలు తెచ్చుకొనుటకు SANE పరికరం."
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "స్కాన్ చేయబడుచున్న పత్ర రకం"
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "స్కాన్‌చేయు దిశ"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "స్కాన్‌చేయబడిన బొమ్మ వెడల్పు(పిక్సెళ్ళలో)"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
 msgstr ""
+"స్కాన్ చేయబడిన బొమ్మ  వెడల్పు పిక్సెళ్ళలో. ఇటీవలి స్కాన్‌చేసిన పేజీ అధారంగా "
+"ఈ సంఖ్యమార్చబడుతుంది."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "స్కాన్‌చేయబడిన బొమ్మ ఎత్తు(పిక్సెళ్ళలో)"
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 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
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "పేపర్ వెడల్పు (మిమీ లో దశాంశభాగం)"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
+"పేపర్ వెడల్పు మిల్లీమీటర్ లో దశాంశభాగాలలో (లేక 0 స్వయంచాలక పేపర్ పొడవు "
+"కనుగొనటానికి)"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "పేపర్ ఎత్తు (మిమీలో దశాంశభాగం)"
 
-#: ../data/simple-scan.schemas.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
 msgstr ""
+"పేపర్ పొడవు మిల్లీమీటర్ లో దశాంశభాగాలలో (లేక 0 స్వయంచాలక పేపర్ పొడవు "
+"కనుగొనటానికి)"
 
-#: ../data/simple-scan.schemas.in.h:17
-msgid "The resolution in dots-per-inch of the previously scanned image."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:19
-msgid "The resolution in dots-per-inch to use when scanning text."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "ఇటీవలి స్కాన్‌చేయబడిన బొమ్మ విభాజకత"
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
+msgid "The resolution in dots-per-inch of the previously scanned image."
+msgstr "ఇటీవల స్కాన్ చేయబడిన బొమ్మ విభాజకత (అంగుళానికి చుక్కలు)"
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "పాఠ్య స్కాన్‌లకు విభాజకత"
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr "పాఠం స్కాన్ చేయుటకు వాడవలసిన విభాజకత (అంగుళానికి చుక్కలు)"
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "ఫొటో స్కాన్‌లకు విభాజకత"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "ఫొటోలు స్కాన్ చేయుటకు వాడవలసిన విభాజకత (అంగుళానికి చుక్కలు)"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "ఏ వైపునుంచి పేజీని స్కాన్‌చేయాలి"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "పేజీని స్కాన్ చేయవలసిన భాగం."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "ఫైళ్లు దాచవలసిన సంచయం"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
+"ఫైళ్లు దాచవలసిన సంచయం. గమ్యస్థానం ఇవ్వనట్లైతే పత్రాల (Documents) అప్రమేయ "
+"సంచయం వాడబడుతుంది."
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
-msgstr ""
+msgstr "ఏ స్కానర్‌లు అందుబాటులోలేవు. దయచేసి ఒక స్కానర్‌ను అనుసంధానించండి."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
-msgstr ""
+msgstr "స్కానర్‌కు అనుసంధానించలేకపోతోంది"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
-msgstr ""
+msgstr "స్కాన్ ప్రారంభించుట వీలుకాలేదు"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
+msgstr "స్కానర్‌తో వర్తమాన దోషం"
+
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "విడుదల రూపాంతరాన్ని చూపించు"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "దోషశుద్ధి సందేశాలను ముద్రించు"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
-msgstr ""
+msgstr "స్కాన్‌చేయుటలో విఫలమైంది"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
-msgstr ""
+msgstr "స్కాన్‌చేయబడిన పత్రం"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
-msgstr ""
+msgid "Run '%s --help' to see a full list of available command line options."
+msgstr "అందుబాటులో వున్న అదేశ వరుస ఐచ్చికముల కొరకు '%s --help' నడుపు."
 
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
-#, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
-msgstr ""
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "స్కాన్‌చేయబడిన పత్రం.pdf"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
-msgstr ""
+msgstr "'%s' వాడుటకు వాడుకరిపేరు మరియు సంకేతపదం కావాలి"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
-msgstr ""
+msgstr "ఏ స్కానర్‌లు కనిపెట్టబడలేదు"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
-
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr ""
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr ""
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr ""
+"మీ స్కానర్ విద్యుత్తుచే చేతనమై కంప్యూటర్‌కు అనుసంధానమైనదో లేదో చూడండి."
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
-msgstr ""
+msgstr "ఇలా దాచు..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
-msgstr ""
+msgstr "బొమ్మ ఫైళ్లు"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
-msgstr ""
+msgstr "అన్ని ఫైళ్ళు"
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
-msgstr ""
+msgstr "ఫైల్ రకం ఎంచుకోండి( _T)"
+
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF (బహుళ-పేజి పత్రం)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (కుదించిన)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (నష్టంలేని)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
-msgstr ""
+msgstr "ఫైల్ దాచుటలో విఫలమైంది"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
-msgstr ""
+msgstr "ఒకవేళ మీరు దాచకపోతే, మార్పులను శాశ్వతముగా కోల్పోతారు."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
-msgstr ""
+msgstr "ప్రస్తుత పత్రాన్ని దాచాలా?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
-msgstr ""
+msgstr "మార్పులు వదలివేయి"
+
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "మునుజూపు కొరకు బొమ్మను భద్రపరుచులేకపోతున్నది"
 
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
-msgstr ""
+msgstr "బొమ్మ మునుజూపు అనువర్తనం తెరచుట వీలుకాలేదు"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
-msgstr ""
+msgstr "సహాయ ఫైలు తెరువలేకపోయింది"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -552,77 +606,191 @@ msgid ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
+"ఈ ప్రోగ్రామ్ ‌వుచిత సాఫ్ట్వేర్:  మీరు తిరిగి పంపిణీ లేక మార్పులు,  ఫ్రీ "
+"సాఫ్ట్వేర్ ఫౌండేషన్ వారి  GNU General Public License రూపాంతరము 3 లేక తరువాతి "
+"రూపాంతరం(మీ కిష్టమైతే) చేయవచ్చు.\n"
+"\n"
+"\n"
+"ఈ ప్రోగ్రామ్  వుపయోగంగా వుంటుందని పంపిణీ చేస్తున్నాము. ఏవిధమైన హామీ, "
+"వ్యాపారయోగ్యమని, లేక ఒకనొక పనికి తగినదని హామీలు లేవు. మరిన్ని వివరాలకు   "
+"చూడండి GNU General Public License\n"
+"\n"
+"GNU General Public License మీకు దీనితో ఇచ్చి వుండాలి\n"
+" లేనిచో చూడండి <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
-msgstr ""
+msgstr "సింపుల్ స్కాన్ గురించి"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
-msgstr ""
+msgstr "సులభంగా పత్ర స్కానింగ్‌చేయు సాధనం"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
+"  Launchpad Translations Administrators https://launchpad.net/~rosetta\n"
+"  Praveen Illa https://launchpad.net/~telugulinux\n"
+"  arjuna rao chavala https://launchpad.net/~arjunaraoc\n"
 "  వీవెన్ (Veeven) https://launchpad.net/~veeven"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
-msgstr ""
+msgstr "నిష్క్రమించేముందు పత్రాన్ని దాచాలా?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
-msgstr ""
+msgstr "దాచకుండా నిష్క్రమించు"
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
 #, c-format
-msgid "%d dpi (draft)"
-msgstr ""
+msgid "%d dpi (default)"
+msgstr "%d dpi (అప్రమేయ)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1292
 #, c-format
-msgid "%d dpi"
-msgstr ""
+msgid "%d dpi (draft)"
+msgstr "%d dpi (చిత్తు)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
-msgstr ""
+msgstr "%d dpi (ఉన్నత విభాజకత)"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
-msgstr ""
+msgid "%d dpi"
+msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
-msgstr ""
+msgstr "కనబడని ఫైళ్లు"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
-msgstr ""
+msgstr "దయచేసి మీ స్థాపనని సరిచూసుకోండి"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
-msgstr ""
+msgstr "స్కానర్‌ను మార్చు(_S)"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
+msgstr "స్వయంచాలక"
+
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
 msgstr ""
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
 msgstr ""
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr ""
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr ""
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr ""
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr ""
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr ""
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr ""
+
+#~ msgid ""
+#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ msgstr "స్కాన్ చేయుటకు పేజీ భాగం. రెండువైపుల పైన, వెనుక,"
+
+#~ msgid ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ msgstr ""
+#~ "స్కాన్ మార్గం స్కాన్ పేజీపై. 'పైనుండి క్రిందికి' ' క్రింది నుండి పైకి'  "
+#~ "'ఎడమనుండికుడి' 'కుడినుండిఎడమ'"
+
+#~ msgid ""
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
+#~ msgstr ""
+#~ "స్కాన్ చేయబడుచున్న పత్ర రకం  'పాఠం' పాఠ్యపత్రములకు, 'ఫోటో' ఫొటోలకొరకు.  ఈ "
+#~ "అమరిక స్కాన్ విభాజకత, రంగులు మరియు స్కాన్ చేసినతరువాత పనులు నిర్ణయించును"
+
+#, c-format
+#~ msgid ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+#~ msgstr ""
+#~ "సహాయ ఎంపికలు:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "వాడుక:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "GTK+ ఎంపికలు:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
diff --git a/po/th.po b/po/th.po
index 37c5d38..f4e8c1c 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,564 +7,587 @@ msgid ""
 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-11-16 03:37+0000\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-07-23 09:09+0000\n"
 "Last-Translator: AnuchitChalothorn <anoochit@gmail.com>\n"
 "Language-Team: Thai <th@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-11-17 04:59+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Simple Scan"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr "A_4"
+msgid "_Document"
+msgstr "เ_อกสาร"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr "สแกน"
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "_หน้าเดี่ยว"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:10
 msgid "All Pages From _Feeder"
 msgstr "ทุกหน้าจาก_ตัวป้อนกระดาษ"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr "หลัง"
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
-msgstr "ตัด"
+msgid "_Stop Scan"
+msgstr "_หยุดสแกน:"
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr "ตัดหน้าที่เลือก"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr "หน้า"
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr "หน้าและหลัง"
-
-#. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr "Le_gal"
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr "สร้าง"
-
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr "ขนาดกระดาษ :"
+msgid "Text"
+msgstr "ข้อความ"
 
 #. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
+#: ../data/simple-scan.ui.h:16
 msgid "Photo"
 msgstr "ภาพถ่าย"
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr "คุณสมบัติ"
-
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
-msgstr "หมุนซ้าย"
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr "_อีเมล"
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr "หมุนขวา"
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr "_หน้า"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
+#: ../data/simple-scan.ui.h:22
 msgid "Rotate _Left"
 msgstr "หมุน_ซ้าย"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
+#: ../data/simple-scan.ui.h:24
 msgid "Rotate _Right"
 msgstr "หมุน_ขวา"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "หมุนหน้าไปทางซ้าย (ทวนเข็มนาฬิกา)"
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "_ตัด"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr "หมุนหน้าไปทางขวา (ตามเข็มนาฬิกา)"
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "ไ_ม่มี"
 
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "_จดหมาย"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "Le_gal"
+
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr "บันทึก"
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr "บันทึกเอกสารเป็นแฟ้ม"
+msgid "_Custom"
+msgstr "_กำหนดเอง"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr "สแกน"
+msgid "_Rotate Crop"
+msgstr "หมุ_นภาพตัด"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
-msgstr "สแกน"
+msgid "Move Left"
+msgstr "ย้ายไปทางซ้าย"
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr "แ_หล่งสแกน:"
+msgid "Move Right"
+msgstr "ย้ายไปทางขวา"
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr "สแกนด้าน:"
+msgid "_Help"
+msgstr "_วิธีใช้"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
-msgstr "สแกนหน้าเดียวจากเครื่องสแกน"
-
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr "Simple Scan"
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr "_หน้าเดี่ยว"
+msgid "_Contents"
+msgstr "เ_นื้อหา"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
 msgstr "เริ่มเอกสารใหม่"
 
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "สร้าง"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "สแกนหน้าเดียวจากเครื่องสแกน"
+
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
-msgstr "หยุด"
+msgid "Scan"
+msgstr "สแกน"
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr "บันทึกเอกสารเป็นแฟ้ม"
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "บันทึก"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
 msgid "Stop the current scan"
 msgstr "หยุดการสแกนขณะนี้"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr "ข้อความ"
-
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr "_อนุญาต"
+msgid "Stop"
+msgstr "หยุด"
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
-msgstr "เ_นื้อหา"
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "หมุนหน้าไปทางซ้าย (ทวนเข็มนาฬิกา)"
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr "_ตัด"
+msgid "Rotate Left"
+msgstr "หมุนซ้าย"
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr "_กำหนดเอง"
+msgid "Rotate the page to the right (clockwise)"
+msgstr "หมุนหน้าไปทางขวา (ตามเข็มนาฬิกา)"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr "เ_อกสาร"
+msgid "Rotate Right"
+msgstr "หมุนขวา"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "ตัดหน้าที่เลือก"
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
-msgstr "_อีเมล"
+msgid "Crop"
+msgstr "ตัด"
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr "_วิธีใช้"
+msgid "_Username for resource:"
+msgstr "_ชื่อผู้ใช้ทรัพยากร :"
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr "_จดหมาย"
+msgid "_Password:"
+msgstr "รหัส_ผ่าน:"
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr "ไ_ม่มี"
+msgid "_Authorize"
+msgstr "_อนุญาต"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr "_หน้า"
+msgid "Preferences"
+msgstr "คุณสมบัติ"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr "รหัส_ผ่าน:"
+msgid "Scan S_ource:"
+msgstr "แ_หล่งสแกน:"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
-msgstr "ความละเอียด_ภาพถ่าย:"
+msgid "_Text Resolution:"
+msgstr "ความละเอียด_ข้อความ:"
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr "หมุ_นภาพตัด"
+msgid "_Photo Resolution:"
+msgstr "ความละเอียด_ภาพถ่าย:"
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
-msgstr "_หยุดสแกน:"
+msgid "Scan Side:"
+msgstr "สแกนด้าน:"
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
-msgstr "ความละเอียด_ข้อความ:"
+msgid "Page Size:"
+msgstr "ขนาดกระดาษ :"
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
-msgstr "_ชื่อผู้ใช้ทรัพยากร :"
+msgid "Brightness:"
+msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
-msgstr "สแกนเอกสาร"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
-msgstr "เครื่องสแกนจาก"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
-msgstr "ทิศทางของการสแกน"
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "หน้าและหลัง"
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
-msgstr "ไดเรคทอรีเพื่อบันทึกไฟล์"
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "หน้า"
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
-msgstr "ความสูงของกระดาษใน 10 ของมิลลิเมตร"
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "หลัง"
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr "ความสูงของภาพที่สแกน เป็นพิกเซล"
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "สแกนเอกสาร"
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
-msgstr "หน้ากระดาษ ด้านที่จะสแกน"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "ความกว้างของหน้าต่างเป็นพิกเซล"
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
-msgstr "ความละเอียดการสแกนภาพถ่าย"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "ความสูงของหน้าต่างเป็นพิกเซล"
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
-msgstr "ความละเอียดการสแกนข้อความ"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "เป็นจริง ถ้าหน้าต่างโปรแกรมขนายเต็มหน้าจอ"
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
-msgstr "ความละเอียดของภาพที่สแกนล่าสุด"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "เครื่องสแกนจาก"
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
 msgstr "อุปกรณ์ SANE เพื่อรับภาพจาก"
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
-msgstr "เป็นจริง ถ้าหน้าต่างโปรแกรมขนายเต็มหน้าจอ"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "ชนิดของเอกสารที่ถูกสแกน"
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
-"ทิศทางการสแกนข้ามหน้าสแกน มีความสามารถดังนี้: 'บน-ไป-ล่าง' 'ล่าง-ไป-บน' "
-"'ซ้าย-ไป-ขวา' 'ขวา-ไป-ซ้าย'"
+"ชนิดของเอกสารที่จะสแกน การตั้งค่านี้มีผลต่อความละเอียดการสแกน สี "
+"และการประมวลผลหลังสแกน"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "ทิศทางของการสแกน"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "ทิศทางของสแกนเนอร์ตอนสแกนผ่านหน้ากระดาษ"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "ความกว้างของภาพที่ สแกนเป็นพิกเซล"
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
 msgstr ""
-"ไดเรกทอรีที่ใช้บันทึกแฟ้ม ค่าเริ่มต้นไดเรกทอรีสำหรับเอกสารถ้าไม่มีการตั้งค่า"
+"ความกว้างของภาพที่สแกน เป็นพิกเซล ค่านี้มีการปรับปรุงจากหน้าที่สแกนล่าสุด"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "ความสูงของภาพที่สแกน เป็นพิกเซล"
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 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
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "ความกว้างของกระดาษใน 10 ของมิลลิเมตร"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"ความกว้างของกระดาษใน 10 ของมิลลิเมตร (หรือ 0 สำหรับการตรวจสอบกระดาษอัตโนมัติ)"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "ความสูงของกระดาษใน 10 ของมิลลิเมตร"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 "ความสูงของกระดาษใน 10 ของมิลลิเมตร (หรือ 0 สำหรับการตรวจสอบกระดาษอัตโนมัติ)"
 
-#: ../data/simple-scan.schemas.in.h:16
-msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
-msgstr "สแกนหน้ากระดาษ สามารถสแกนได้จากนี้ :'ทั้งคู่' 'หน้า' 'หลัง'"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "ความละเอียดของภาพที่สแกนล่าสุด"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
 msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr "ความละเอียด เป็นจุดต่อ นิ้วของภาพที่สแกนก่อนหน้านี้"
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "ความละเอียด เป็นจุดต่อนิ้วที่จะใช้เมื่อการสแกนภาพ"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "ความละเอียดการสแกนข้อความ"
 
-#: ../data/simple-scan.schemas.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "ความละเอียด เป็นจุดต่อนิ้วที่จะใช้เมื่อการสแกนข้อความ"
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"ความกว้างของภาพที่สแกน เป็นพิกเซล ค่านี้มีการปรับปรุงจากหน้าที่สแกนล่าสุด"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "ความละเอียดการสแกนภาพถ่าย"
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"ความกว้างของกระดาษใน 10 ของมิลลิเมตร (หรือ 0 สำหรับการตรวจสอบกระดาษอัตโนมัติ)"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "ความละเอียด เป็นจุดต่อนิ้วที่จะใช้เมื่อการสแกนภาพ"
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
-msgstr "ชนิดของเอกสารที่ถูกสแกน"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "หน้ากระดาษ ด้านที่จะสแกน"
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
-msgstr ""
-"ชนิดของเอกสารที่ถูกสแกน 'ข้อความ'สำหรับเอกสารข้อความ'รูปภาพ'สำหรับภาพถ่าย "
-"การตั้งค่านี้ตัดสินใจในการสแกนความละเอียดของสีและหลังการประมวลผล"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "ด้านกระดาษที่จะสแกน"
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
-msgstr "ความกว้างของกระดาษใน 10 ของมิลลิเมตร"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "ไดเรคทอรีเพื่อบันทึกไฟล์"
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
-msgstr "ความกว้างของภาพที่ สแกนเป็นพิกเซล"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"ไดเรกทอรีที่ใช้บันทึกแฟ้ม ค่าเริ่มต้นไดเรกทอรีสำหรับเอกสารถ้าไม่มีการตั้งค่า"
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
-msgstr "ความสูงของหน้าต่างเป็นพิกเซล"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
-msgstr "ความกว้างของหน้าต่างเป็นพิกเซล"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
 msgstr "เครื่องสแกนไม่สามารถใช้ได้ โปรดเชื่อมต่อเครื่องสแกน"
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
 msgstr "ไม่สามารถเชื่อมต่อเครื่องสแกน"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
 msgstr "ไม่สามารถเริ่มต้นการสแกน"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
 msgstr "การสื่อสารกับเครื่องสแกนผิดพลาด"
 
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "แสดงรุ่นที่ออก"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "แสดงข้อความข้อบกพร่อง"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr "ซ่อมแฟ้ม PDF ที่ถูกสร้างด้วย Simple Scan รุ่นที่เก่ากว่า"
+
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
 msgstr "การสแกนล้มเหลว"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
 msgstr "เอกสารที่สแกนแล้ว"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
-msgstr ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[DEVICE...] - เครื่องมือกำลังสแกน"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
-msgstr ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
-
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
-#, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
-msgstr ""
-"ตัวเลือก GTK+:\n"
-"  --class=CLASS                   "
-"คลาสของโปรแกรมตามที่ใช้โดยโปรแกรมจัดการหน้าต่าง\n"
-"  --name=NAME                     "
-"ชื่อของโปรแกรมตามที่ใช้โดยโปรแกรมจัดการหน้าต่าง\n"
-"  --screen=SCREEN                 สกรีน X ที่จะใช้\n"
-"  --sync                          ทำให้การเรียก X เป็นแบบหยุดคอย "
-"(synchronous)\n"
-"  --gtk-module=MODULES            โหลดมอดูล GTK+ เพิ่มเติม\n"
-"  --g-fatal-warnings              ถือว่าคำเตือนต่างๆ "
-"ที่เกิดขึ้นเป็นความผิดพลาดร้ายแรง"
+msgid "Run '%s --help' to see a full list of available command line options."
+msgstr "เรียก '%s --help' เพื่อดูตัวเลือกทั้งหมดที่มีของบรรทัดคำสั่ง"
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "สแกน Document.pdf แล้ว"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "ต้องการชื่อผู้ใช้และรหัสผ่านเพื่อเข้าใช้ '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
 msgstr "ไม่พบเครื่องสแกน"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
 msgstr "กรุณาตรวจสอบการเชื่อมต่อเครื่องสแกนของคุณและเปิดเครื่อง"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr "PDF (เอกสารหลายหน้า)"
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr "JPEG (บีบอัดแล้ว)"
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr "PNG (lossless)"
-
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
 msgstr "บันทึกเป็น..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
 msgstr "แฟ้มภาพ"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
 msgstr "แฟ้มทั้งหมด"
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
 msgstr "เลือก_ประเภทแฟ้ม"
 
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF (เอกสารหลายหน้า)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (บีบอัดแล้ว)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (lossless)"
+
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
 msgstr "การบันทึกแฟ้มล้มเหลว"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
 msgstr "ถ้าคุณไม่บันทึกการแก้ไขทั้งหมดจะสูญหายอย่างถาวร"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
 msgstr "บันทึกเอกสารปัจจุบัน"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
 msgstr "ยกเลิกการเปลี่ยนแปลง"
 
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "ไม่สามารถบัญทึกรูปภาพตัวอย่าง"
+
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
 msgstr "ไม่สามารถเปิดโปรแกรมแสดงภาพได้"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
 msgstr "ไม่สามารถเปิดแฟ้มเอกสารวิธีใช้"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -593,76 +616,182 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
 msgstr "เกี่ยวกับ Simple Scan"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
 msgstr "เครื่องมือสแกนเอกสารอย่างง่าย"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
+"  Anuchit Chalothorn https://launchpad.net/~anuchit-redlinesoft\n"
 "  AnuchitChalothorn https://launchpad.net/~anuchit\n"
-"  SiraNokyoongtong https://launchpad.net/~gumara"
+"  Manop Pornpeanvichanon(มานพ พรเพียรวิชานนท์) "
+"https://launchpad.net/~manoppornpeanvichanon\n"
+"  SiraNokyoongtong https://launchpad.net/~gumara\n"
+"  kijjaz https://launchpad.net/~kijjaz-gmail"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
 msgstr "บันทึกเอกสารก่อนปิดหรือไม่?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
 msgstr "ปิดโดยไม่บันทึก"
 
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (ค่าปริยาย)"
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#: ../src/ui.vala:1292
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (ภาพร่าง)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
-#, c-format
-msgid "%d dpi"
-msgstr "%d dpi"
-
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (ความละเอียดสูง)"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
-msgstr "%d dpi (ค่าปริยาย)"
+msgid "%d dpi"
+msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
 msgstr "ไม่พบแฟ้ม"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
 msgstr "กรุณาตรวจสอบการติดตั้งของคุณ"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
 msgstr "เ_ปลี่ยนเครื่องสแกน"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
 msgstr "อัตโนมัติ"
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
-msgstr "สแกน Document.pdf แล้ว"
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr ""
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr ""
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr ""
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr ""
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr ""
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr ""
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr ""
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr ""
+
+#~ msgid ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ msgstr ""
+#~ "ทิศทางการสแกนข้ามหน้าสแกน มีความสามารถดังนี้: 'บน-ไป-ล่าง' 'ล่าง-ไป-บน' "
+#~ "'ซ้าย-ไป-ขวา' 'ขวา-ไป-ซ้าย'"
+
+#~ msgid ""
+#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ msgstr "สแกนหน้ากระดาษ สามารถสแกนได้จากนี้ :'ทั้งคู่' 'หน้า' 'หลัง'"
+
+#~ msgid ""
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
+#~ msgstr ""
+#~ "ชนิดของเอกสารที่ถูกสแกน 'ข้อความ'สำหรับเอกสารข้อความ'รูปภาพ'สำหรับภาพถ่าย "
+#~ "การตั้งค่านี้ตัดสินใจในการสแกนความละเอียดของสีและหลังการประมวลผล"
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+
+#, c-format
+#~ msgid ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+#~ msgstr ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "ตัวเลือก GTK+:\n"
+#~ "  --class=CLASS                   "
+#~ "คลาสของโปรแกรมตามที่ใช้โดยโปรแกรมจัดการหน้าต่าง\n"
+#~ "  --name=NAME                     "
+#~ "ชื่อของโปรแกรมตามที่ใช้โดยโปรแกรมจัดการหน้าต่าง\n"
+#~ "  --screen=SCREEN                 สกรีน X ที่จะใช้\n"
+#~ "  --sync                          ทำให้การเรียก X เป็นแบบหยุดคอย "
+#~ "(synchronous)\n"
+#~ "  --gtk-module=MODULES            โหลดมอดูล GTK+ เพิ่มเติม\n"
+#~ "  --g-fatal-warnings              ถือว่าคำเตือนต่างๆ "
+#~ "ที่เกิดขึ้นเป็นความผิดพลาดร้ายแรง"
diff --git a/po/tr.po b/po/tr.po
index c0e22f1..a13f66f 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,325 +7,347 @@ msgid ""
 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-08-22 08:56+0000\n"
-"Last-Translator: Yalçın Can <Unknown>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-07-23 09:09+0000\n"
+"Last-Translator: Robert Ancell <robert.ancell@canonical.com>\n"
 "Language-Team: Turkish <tr@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-10-22 04:48+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Basit Tarama"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr "A_4"
+msgid "_Document"
+msgstr "_Belge"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr "T_ara"
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "_Tek Sayfa"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:10
 msgid "All Pages From _Feeder"
 msgstr "Kaynaktaki Tüm _Sayfalar"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr "Arka taraf"
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
-msgstr "Kırp"
+msgid "_Stop Scan"
+msgstr "_Taramayı Durdur"
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr "Seçili sayfayı kırp"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr "Ön taraf"
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr "Ön ve Arka taraf"
-
-#. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr "Ya_sal"
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr "Yeni"
-
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr "Sayfa Boyutu:"
+msgid "Text"
+msgstr "Metin"
 
 #. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
+#: ../data/simple-scan.ui.h:16
 msgid "Photo"
 msgstr "Fotoğraf"
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr "Tercihler"
-
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
-msgstr "Sola Döndür"
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr "_Eposta"
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr "Sağa Döndür"
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr "_Sayfa"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
+#: ../data/simple-scan.ui.h:22
 msgid "Rotate _Left"
-msgstr "_Sola Çevir"
+msgstr "_Sola Döndür"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
+#: ../data/simple-scan.ui.h:24
 msgid "Rotate _Right"
 msgstr "Sa_ğa Çevir"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Sayfayı sola döndür (saat yönünün tersine)"
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "_Kırp"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Sayfayı sağa döndür (saat yönünde)"
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "_Hiçbiri"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
 
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "_Harf"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "Ya_sal"
+
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr "Kaydet"
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr "Belgeyi bir dosyaya kaydet"
+msgid "_Custom"
+msgstr "_Özel"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr "T_ara"
+msgid "_Rotate Crop"
+msgstr "_Kırpmayı Döndür"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
-msgstr "Tara"
+msgid "Move Left"
+msgstr "Sola Taşı"
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr "Ta_rama Kaynağı:"
+msgid "Move Right"
+msgstr "Sağa Taşı"
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr "Taranacak taraf:"
+msgid "_Help"
+msgstr "_Yardım"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
-msgstr "Tarayıcıdan tek bir sayfa tara"
-
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr "Basit Tarama"
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr "_Tek Sayfa"
+msgid "_Contents"
+msgstr "_İçindekiler"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
 msgstr "Yeni bir belge başlat"
 
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "Yeni"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "Tarayıcıdan tek bir sayfa tara"
+
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
-msgstr "Durdur"
+msgid "Scan"
+msgstr "Tara"
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr "Belgeyi bir dosyaya kaydet"
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "Kaydet"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
 msgid "Stop the current scan"
 msgstr "Geçerli taramayı durdur"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr "Metin"
-
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr "_Yetkilendir"
+msgid "Stop"
+msgstr "Durdur"
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
-msgstr "_İçindekiler"
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Sayfayı sola döndür (saat yönünün tersine)"
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr "_Kırp"
+msgid "Rotate Left"
+msgstr "Sola Döndür"
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr "_Özel"
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Sayfayı sağa döndür (saat yönünde)"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr "_Belge"
+msgid "Rotate Right"
+msgstr "Sağa Döndür"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "Seçili sayfayı kırp"
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
-msgstr "_Eposta"
+msgid "Crop"
+msgstr "Kırp"
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr "_Yardım"
+msgid "_Username for resource:"
+msgstr "Kaynak için _kullanıcı adı:"
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr "_Harf"
+msgid "_Password:"
+msgstr "_Parola:"
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr "_Hiçbiri"
+msgid "_Authorize"
+msgstr "_Yetkilendir"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr "_Sayfa"
+msgid "Preferences"
+msgstr "Tercihler"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr "_Parola:"
+msgid "Scan S_ource:"
+msgstr "Ta_rama Kaynağı:"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
-msgstr "_Fotoğraf Çözünürlüğü:"
+msgid "_Text Resolution:"
+msgstr "_Metin Çözünürlüğü:"
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr "_Kırpmayı Döndür"
+msgid "_Photo Resolution:"
+msgstr "_Fotoğraf Çözünürlüğü:"
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
-msgstr "_Taramayı Durdur"
+msgid "Scan Side:"
+msgstr "Taranacak taraf:"
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
-msgstr "_Metin Çözünürlüğü:"
+msgid "Page Size:"
+msgstr "Sayfa Boyutu:"
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
-msgstr "Kaynak için _kullanıcı adı:"
+msgid "Brightness:"
+msgstr "Parlaklık:"
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
-msgstr "Belgeleri Tara"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr "Karşıtlık:"
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
-msgstr "Tarama yapılacak aygıt"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr "Kalite:"
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
-msgstr "Tarama yönü"
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "Ön ve Arka taraf"
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
-msgstr "Dosyaların kaydedileceği dizin"
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "Ön taraf"
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
-msgstr "Ondabirlik mm cinsinden kağıdın yüksekliği"
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "Arka taraf"
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr "Taranan görüntünün piksel cinsinden yüksekliği"
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "Belgeleri Tara"
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
-msgstr "Taranacak sayfa tarafı"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "Pencerenin piksel cinsinden genişliği"
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
-msgstr "Fotoğraf taramaları için çözünürlük"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "Pencerenin piksel cinsinden yüksekliği"
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
-msgstr "Metin taramaları için çözünürlük"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "Uygulama penceresi ekranı kapladığında DOĞRU (TRUE)"
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
-msgstr "En son taranan görüntünün çözünürlüğü"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "Tarama yapılacak aygıt"
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
 msgstr "Görüntülerin alınacağı SANE aygıtı"
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
-msgstr "Eğer uygulama penceresi maksimum yapıldığında DOĞRU (TRUE)"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "Taranacak belgenin türü"
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
-"Tarayıcının taranan sayfa boyunca yönü. Şunlardan biri olabilir: 'yukarıdan "
-"aşağıya' 'aşağıdan yukarıya' 'soldan sağa' 'sağdan sola'"
+"Taranacak belge türü. Bu ayar tarama kalitesi, renkler ve son işlemlere göre "
+"belirlenir."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "Tarama yönü"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "Tarayıcının taranmış sayfa boyunca yönü."
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "Taranan görüntünün piksel cinsinden genişliği"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
 msgstr ""
-"Dosyaların kaydedileceği dizin. Ayarlanmadıysa, belgeler dizini "
-"varsayılandır."
+"Taranan görüntünün piksel cinsinden genişliği. Bu değer en son taranan "
+"sayfaya göre güncellenir."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "Taranan görüntünün piksel cinsinden yüksekliği"
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
@@ -333,248 +355,250 @@ msgstr ""
 "Taranan görüntünün piksel cinsinden yüksekliği. Bu değer en son taranan "
 "sayfaya göre güncellenir."
 
-#: ../data/simple-scan.schemas.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "Ondabirlik mm cinsinden kağıdın genişliği"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
-"Ondabirlik mm cinsinden kağıdın yüksekliği ( ya da otomatik kağıt tespiti "
+"Ondabirlik mm cinsinden kağıdın genişliği ( ya da otomatik kağıt tespiti "
 "için 0)."
 
-#: ../data/simple-scan.schemas.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "Ondabirlik mm cinsinden kağıdın yüksekliği"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
 msgstr ""
-"Taranacak sayfa tarafı. Şu seçeneklerden biri olabilir: 'her iki taraf' 'ön "
-"taraf' 'arka taraf'"
+"Ondabirlik mm cinsinden kağıdın yüksekliği ( ya da otomatik kağıt tespiti "
+"için 0)."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr "Tarama parlaklığı"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "-100'den 100'e (0 hiçbiri) parlaklık ayarlaması"
 
-#: ../data/simple-scan.schemas.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr "Tarama karşıtlığı"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "-100'den 100'e (0 hiçbiri) karşıtlık ayarlaması"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "En son taranan görüntünün çözünürlüğü"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
 msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr ""
 "Bir önceki taranan görüntünün inç başına nokta sayısı cinsinden çözünürlüğü."
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr ""
-"Fotoğrafları tararken kullanılacak inç başına nokta sayısı cinsinden "
-"çözünürlük."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "Metin taramaları için çözünürlük"
 
-#: ../data/simple-scan.schemas.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 "Metin tararken kullanılacak inç başına nokta sayısı cinsinden çözünürlük."
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"Taranan görüntünün piksel cinsinden genişliği. Bu değer en son taranan "
-"sayfaya göre güncellenir."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "Fotoğraf taramaları için çözünürlük"
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
-"Ondabirlik mm cinsinden kağıdın genişliği ( ya da otomatik kağıt tespiti "
-"için 0)."
+"Fotoğrafları tararken kullanılacak inç başına nokta sayısı cinsinden "
+"çözünürlük."
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
-msgstr "Taranacak belgenin türü"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "Taranacak sayfa tarafı"
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
-msgstr ""
-"Taranan belgenin türü. Metin belgeleri için 'metin', fotoğraflar için "
-"'fotoğraf'. Bu ayar tarama çözünürlüğünü, renkleri ve  tarama sonrası "
-"işlemleri belirler."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "Taranacak sayfa yüzü."
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
-msgstr "Ondabirlik mm cinsinden kağıdın genişliği"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "Dosyaların kaydedileceği dizin"
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
-msgstr "Taranan görüntünün piksel cinsinden genişliği"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Dosyaların kaydedileceği dizin. Ayarlanmadıysa, belgeler dizini "
+"varsayılandır."
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
-msgstr "Pencerenin piksel cinsinden yüksekliği"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr "JPEG sıkıştırması için kalite değeri"
 
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
-msgstr "Pencerenin piksel cinsinden genişliği"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr "JPEG sıkıştırması için kalite değeri"
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Mevcut hiçbir tarayıcı yok. Lütfen bir tarayıcı bağlayın."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
 msgstr "Tarayıcıya bağlanılamadı"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
 msgstr "Tarama başlatılamadı"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
 msgstr "Tarayıcı ile iletişim kurulamıyor"
 
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Dağıtım sürümünü göster"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Hata ayıklama iletilerini yazdır"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr "Basit Tarama'nın eski sürümlerince üretilen PDF dosyalarını düzelt"
+
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
 msgstr "Tarama başarısız oldu"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
 msgstr "Taranmış Belge"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
-msgstr ""
-"Usage:\n"
-"  %s [AYGIT...] - Tarama aracı"
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[AYGIT...] - Tarama uygulaması"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
+msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
-"Yardım Seçenekleri:\n"
-"  -d, --debug Hata ayıklama iletilerini yaz\n"
-"  -v, --version Sürüm numarasını göster\n"
-"  -h, --help Yardım seçeneklerini göster\n"
-"  -help-all Tüm yardım seçeneklerini göster\n"
-"  --help-gtk GTK+ seçeneklerini göster"
-
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
-#, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
-msgstr ""
-"GTK+ Seçenekleri: \n"
-"  --class=SINIF                   Pencere yöneticisi tarafından kullanılan "
-"program sınıfı\n"
-"  --name=İSİM                     Pencere yöneticisi tarafından kullanılacak "
-"program ismi\n"
-" --screen=EKRAN                  Kullanılacak X ekranı\n"
-"  --sync                          X çağrılarını eş zamanlı yapar\n"
-" --gtk-module=MODULLER          Tüm ek GTK+ modullerini yükler\n"
-"  --g-fatal-warnings              Tüm uyarıları ölümcül yapar"
+"Kullanılabilir komut satırı seçeneklerinin tam listesini görmek için '%s --"
+"help' komutunu çalıştırın."
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "Taranan Belge.pdf"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "'%s' kaynağına erişmek için kullanıcı adı ve parola gerekiyor"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
 msgstr "Tarayıcı bulunamadı"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
 msgstr "Lütfen tarayıcınızın bağlı ve açık olduğundan emin olun"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr "PDF (çok sayfalı belge)"
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr "JPEG (sıkıştırılmış)"
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr "PNG (kayıpsız)"
-
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
 msgstr "Farklı Kaydet..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
 msgstr "Resim Dosyaları"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
 msgstr "Tüm Dosyalar"
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
 msgstr "Dosya _Türünü Seç"
 
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF (çok sayfalı belge)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (sıkıştırılmış)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (kayıpsız)"
+
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
 msgstr "Dosya kaydedilemedi"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Eğer kaydetmezseniz, değişiklikler tamamen kaybedilecek."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
 msgstr "Mevcut belgeyi kaydet?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
 msgstr "Değişiklikleri Geri Al"
 
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "Görüntü, önizleme için kaydedilemiyor"
+
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
 msgstr "Görüntü ön izleme uygulaması açılamıyor"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
 msgstr "Yardım dosyası açılamıyor"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -603,80 +627,196 @@ msgstr ""
 "Eğer almadıysanız bile şuraya bakınız: <http://www.gnu.org/licenses/>"
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
 msgstr "Basit Tarama Hakkında"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
 msgstr "Basit bir belge tarama aracı"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Angel Spy https://launchpad.net/~dilara.ekinci\n"
+"  Cihan Ersoy https://launchpad.net/~cihan.ersoy\n"
+"  Devrim Şahin https://launchpad.net/~room449\n"
 "  Efe Çiftci https://launchpad.net/~efeciftci\n"
+"  Erkut Tiryakioglu https://launchpad.net/~erkut-tiryakioglu\n"
+"  Fatih Bostancı https://launchpad.net/~fbostanci\n"
+"  Hasan Yılmaz https://launchpad.net/~hasanyilmaz\n"
+"  Kaan Y. https://launchpad.net/~mr-kxyzup\n"
+"  Mesut Muhammet Şahin https://launchpad.net/~messah\n"
 "  Murat Bişkin https://launchpad.net/~muratbiskin\n"
-"  Yalçın Can https://launchpad.net/~echza\n"
+"  Mustafa Yılmaz https://launchpad.net/~apshalasha\n"
+"  Robert Ancell https://launchpad.net/~robert-ancell\n"
+"  Yalçın Can https://launchpad.net/~yalcin.can\n"
+"  Yiğit Ateş https://launchpad.net/~yigitates52\n"
 "  aries https://launchpad.net/~sonagirbas\n"
-"  ubuntuki https://launchpad.net/~aleverzurumlu"
+"  kulkke https://launchpad.net/~kulkke\n"
+"  mandza https://launchpad.net/~filmovi\n"
+"  ubuntuki https://launchpad.net/~aleverzurumlu\n"
+"  İbrahim Çelik https://launchpad.net/~ibrahimcelik89"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
 msgstr "Çıkmadan önce belgeyi kaydet?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
 msgstr "Kaydetmeden Çık"
 
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (varsayılan)"
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#: ../src/ui.vala:1292
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (taslak)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
-#, c-format
-msgid "%d dpi"
-msgstr "%d dpi"
-
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (yüksek çözünürlük)"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
-msgstr "%d dpi (varsayılan)"
+msgid "%d dpi"
+msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
 msgstr "Dosyalar eksik"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
 msgstr "Lütfen kurulumunuzu denetleyiniz"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
 msgstr "_Tarayıcı Değiştir"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
 msgstr "Otomatik"
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
-msgstr "Taranan Belge.pdf"
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr "Daha Koyu"
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr "Daha Açık"
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr "Daha Az"
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr "Daha Fazla"
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr "En Az"
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr "En Çok"
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "Belge kaydediliyor..."
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "Kaydedilen sayfa: %d / %d"
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "Usage:\n"
+#~ "  %s [AYGIT...] - Tarama aracı"
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "GTK+ Seçenekleri: \n"
+#~ "  --class=SINIF                   Pencere yöneticisi tarafından kullanılan "
+#~ "program sınıfı\n"
+#~ "  --name=İSİM                     Pencere yöneticisi tarafından kullanılacak "
+#~ "program ismi\n"
+#~ " --screen=EKRAN                  Kullanılacak X ekranı\n"
+#~ "  --sync                          X çağrılarını eş zamanlı yapar\n"
+#~ " --gtk-module=MODULLER          Tüm ek GTK+ modullerini yükler\n"
+#~ "  --g-fatal-warnings              Tüm uyarıları ölümcül yapar"
+
+#, c-format
+#~ msgid ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+#~ msgstr ""
+#~ "Yardım Seçenekleri:\n"
+#~ "  -d, --debug Hata ayıklama iletilerini yaz\n"
+#~ "  -v, --version Sürüm numarasını göster\n"
+#~ "  -h, --help Yardım seçeneklerini göster\n"
+#~ "  -help-all Tüm yardım seçeneklerini göster\n"
+#~ "  --help-gtk GTK+ seçeneklerini göster"
+
+#~ msgid ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ msgstr ""
+#~ "Tarayıcının taranan sayfa boyunca yönü. Şunlardan biri olabilir: 'yukarıdan "
+#~ "aşağıya' 'aşağıdan yukarıya' 'soldan sağa' 'sağdan sola'"
+
+#~ msgid ""
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
+#~ msgstr ""
+#~ "Taranan belgenin türü. Metin belgeleri için 'metin', fotoğraflar için "
+#~ "'fotoğraf'. Bu ayar tarama çözünürlüğünü, renkleri ve  tarama sonrası "
+#~ "işlemleri belirler."
+
+#~ msgid ""
+#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ msgstr ""
+#~ "Taranacak sayfa tarafı. Şu seçeneklerden biri olabilir: 'her iki taraf' 'ön "
+#~ "taraf' 'arka taraf'"
diff --git a/po/ug.po b/po/ug.po
index 2970ca5..5e664e6 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -7,566 +7,598 @@ msgid ""
 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-04-11 09:36+0000\n"
-"Last-Translator: azimat <Unknown>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-08-07 01:17+0000\n"
+"Last-Translator: Sahran <Unknown>\n"
 "Language-Team: Uyghur Computer Science Association <ubuntu-l10n-"
 "ug@lists.launchpad.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-22 04:48+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 "X-Poedit-Language: Uighur\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Simple Scan"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr "A_4"
+msgid "_Document"
+msgstr "پۈتۈك(_D)"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr "تەسۋىر ياي(_A)"
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "بىر تاللام بەت(_P)"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:10
 msgid "All Pages From _Feeder"
 msgstr "كىرگۈزگۈچتىن ھەممە بەتلەر(_F)"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr ""
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
-msgstr "كېسىش"
+msgid "_Stop Scan"
+msgstr "تەسۋىر يېيىشنى توختات(_S)"
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr "تاللانغان بەتنى كېسىش"
+msgid "Text"
+msgstr "تېكست"
 
-#. Combo box label for scanning the front side of a page
+#. Combo box label for photo scan mode
 #: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr ""
+msgid "Photo"
+msgstr "سۈرەت"
 
-#. Combo box label for scanning both sides of a page
+#. Label on email menu item
 #: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr ""
+msgid "_Email"
+msgstr "ئېلخەت(_E)"
 
-#. Radio button for cropping to page to US legal size
+#. Page menu (contains action for each page, e.g. delete, crop)
 #: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr "US Legal(_G)"
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr "يېڭى"
+msgid "_Page"
+msgstr "بەت(_P)"
 
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr ""
+#. Menu item to rotate page to left (anti-clockwise)
+#: ../data/simple-scan.ui.h:22
+msgid "Rotate _Left"
+msgstr "سولغا چۆرگىلەت(_L)"
 
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
-msgid "Photo"
-msgstr "سۈرەت"
+#. Menu item to rotate page to right (clockwise)
+#: ../data/simple-scan.ui.h:24
+msgid "Rotate _Right"
+msgstr "ئوڭغا چۆرگىلەت(_R)"
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr "مايىللىق"
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "قىرقىش(_C)"
 
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
-msgstr "سولغا ئايلاندۇرۇش"
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "يوق(_N)"
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr "ئوڭغا ئايلاندۇرۇش"
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
 
-#. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
-msgid "Rotate _Left"
-msgstr "سولغا ئايلاندۇرۇش(_L)"
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
 
-#. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
-msgid "Rotate _Right"
-msgstr "ئوڭغا ئايلاندۇرۇش(_R)"
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "بەتنى سولغا ئايلاندۇرۇش (سائەت يۆلىنىشىگە قارشى)"
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "لىپاپ(_L)"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr "بەتنى ئوڭغا ئايلاندۇرۇش (سائەت يۆلىنىشىدە)"
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "US Legal(_G)"
 
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr "ساقلاش"
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr ""
+msgid "_Custom"
+msgstr "ئىختىيارى(_C)"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr "سكەن(_A)"
+msgid "_Rotate Crop"
+msgstr "كېسىش دائىرىسىنى ئايلاندۇر(_R)"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
-msgstr "سىكەن قىلىش"
+msgid "Move Left"
+msgstr ""
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr "سىكەن قىلىش مەنبەسى(_O):"
+msgid "Move Right"
+msgstr "ئوڭغا يۆتكە"
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr ""
+msgid "_Help"
+msgstr "ياردەم(_H)"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
-msgstr "سىكەننېردىن پەقەت بىر بەتنىلا سىكەن قىلىش"
-
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr "ئاددى سىكەن قىلىش"
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr "بىر تاللام بەت(_P)"
+msgid "_Contents"
+msgstr "مەزمۇنلار(_C)"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
-msgstr "يېڭى ھۆججەت قۇرۇش"
+msgstr "يېڭى بىر پۈتۈك قۇرىدۇ"
+
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "يېڭى"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "شولالىغۇچتىن بىر بەتنىلا تەسۋىر يايىدۇ"
 
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
-msgstr "توختىتىش"
+msgid "Scan"
+msgstr "تەسۋىر ياي"
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
-msgid "Stop the current scan"
-msgstr "نۆۋەتتىكى سكەن باسقۇچىنى توختىتىش"
+msgid "Save document to a file"
+msgstr "پۈتۈكنى ھۆججەتكە ساقلا"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr "تېكست"
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "ساقلا"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
+msgid "Stop the current scan"
+msgstr "نۆۋەتتىكى تەسۋىر يېييشنى توختات"
 
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr "تەستىقلاش(_A)"
+msgid "Stop"
+msgstr "توختا"
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
-msgstr "مەزمۇن(_C)"
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "بەتنى سولغا ئايلاندۇر (سائەت يۆلىنىشىگە قارشى)"
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr "كېسىش(_C)"
+msgid "Rotate Left"
+msgstr "سولغا چۆرگىلىتىش"
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr "ئىختىيارى(_C)"
+msgid "Rotate the page to the right (clockwise)"
+msgstr "بەتنى ئوڭغا ئايلاندۇر (سائەت يۆلىنىشىدە)"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr "ھۆججەت(_D)"
+msgid "Rotate Right"
+msgstr "ئوڭغا چۆرگىلىتىش"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "تاللانغان بەتنى كەس"
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
-msgstr "ئېلخەت(_E)"
+msgid "Crop"
+msgstr "كەس"
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr "ياردەم(_H)"
+msgid "_Username for resource:"
+msgstr "مەنبەنىڭ ئىشلەتكۈچى ئاتى(_U):"
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr "US Letter(_L)"
+msgid "_Password:"
+msgstr "ئىم(_P):"
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr "يوق (N)(_N)"
+msgid "_Authorize"
+msgstr "دەلىللە(_A)"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr "بەت(_P)"
+msgid "Preferences"
+msgstr "مايىللىق"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr "پارول(_P):"
+msgid "Scan S_ource:"
+msgstr "تەسۋىر يېيىش مەنبەسى(_O):"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
-msgstr "–فوتو ئېنىقلىقى(_P):"
+msgid "_Text Resolution:"
+msgstr "تېكست ئېنىقلىقى(_T):"
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr "كېسش تاللانمىسىنى ئايلاندۇرۇش(_R)"
+msgid "_Photo Resolution:"
+msgstr "–فوتو ئېنىقلىقى(_P):"
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
-msgstr "سكەننى توختىتىش(_S)"
+msgid "Scan Side:"
+msgstr "ﺋﯩﺰﺩﯨﻠﺪﯨﻐﺎﻥ ﺑﻪﺕ"
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
-msgstr "تېكست ئېنىقلىقى(_T):"
+msgid "Page Size:"
+msgstr "قەغەز چوڭلۇقى:"
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
-msgstr "مەنبە ئۈچۈن ئىشلەتكۈچى نامى(_U):"
+msgid "Brightness:"
+msgstr "يورۇقلۇق:"
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
-msgstr "ھۆججەتلەرنى سكەنلەش"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr "سېلىشتۇرما دەرىجە:"
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
-msgstr "سكەن ئەسۋەبى"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr "سۈپەت:"
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
-msgstr "سكەنلەش نىشانى"
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "ئالدى كەينى"
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
-msgstr "ئارخىپلار ساقلىنىدىغان نىشان"
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "ئالدى"
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
-msgstr ""
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "قايتىش"
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr "سكەنلىگەن رەسىمنىڭ پىكسېل ئېگىزلىكى"
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "پۈتۈك شولىلاش"
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "كۆزنەك كەڭلىكى (پىكسېل)"
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
-msgstr "فوتو سكەننىڭ ئېنىقلىقى"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "كۆزنەك ئېگىزلىكى (پىكسېل)"
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
-msgstr "تېكست سكەننىڭ ئېنىقلىقى"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "TRUE ئەپ كۆزنەك چوڭايتىلغان بولسا"
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
-msgstr "ئەڭ ئاخىرقى قېتىم سىكەنلىگەن رەسىمنىڭ ئېنىقلىقى"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "تەسۋىر يېيىش ئۈسكۈنىسى"
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
-msgstr "رەسىمگە ئېرشدىغان SANE-ئەسۋابى"
+msgstr "SANE ئۈسكۈنىدىن سۈرەتكە ئېرىشىدۇ."
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
-msgstr "ئەگەر پروگگرامما كۆزنىكى ئەڭ چوڭ ھالدا بولسا TRUE"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "تەسۋىر يايىدىغان پۈتۈكنىڭ تىپى"
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
-"سكەنلىگەن بەتنىڭ سىكەن يۆلىنشىگە بولغان ماسلىقى تۆۋەندىكىدىن بىرسى بۇلىشى "
-"مۇنكىن: ‹ئۈستىدىن ئاستىغا›، ‹ئاستىدىن ئۈستىگە›، ‹سولدىن ئوڭغا›، ‹ئوڭدىن "
-"سولغا›"
+"ھۆججەت تېپى تەكشۈرىلىۋاتىدۇ، بۇ تەڭشەك بولسا ئېنىقلىق دەرىجىسى، رەڭگى ۋە "
+"كىيىنكى بىرتەرەپ قىلىشنى بېكىتىدۇ."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "تەسۋىر يېيىش يۆنىلىشى"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "تەسۋىر ئالغۇچ تەسۋىرگە ئېلىنىپ بولغان بەتتىن ئۆتىدۇ."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "تەسۋىر يايىدىغان سۈرەتنىڭ كەڭلىكى (پىكسېل)"
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
 msgstr ""
-"ئارخىپلار ساقلىنىدىغان نىشان. ئەگەر باشقا نىشان بەلگىلەنگەن بولمىسا، ھۆججەت "
-"ئارخىپى كۆڭۈلدىكى."
+"تەسۋىر يايىدىغان سۈرەتنىڭ كەڭلىكى (پىكسېل). بۇ ئاخىرقى قېتىملىق تەسۋىر "
+"يايغان بەتنىڭ قىممىتى."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "تەسۋىر يايغان سۈرەتنىڭ ئېگىزلىكى (پىكسېل)"
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 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
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "قەغەزنىڭ ئوندىن بىر مىللىمېتىرلىق كەڭلىكى"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
+"قەغەزنىڭ ئوندىن بىر مىللىمېتىرلىق كەڭلىكى (ياكى قەغەزنى ئۆزلۈكىدىن بايقاش "
+"ئۈچۈن 0 )"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "ﻗﻪﻏﻪﺯ ﺋﯩﮕﯩﺰﻟﯩﻜﻰ (mm 0.1 ﺋﯧﻨﯩﻘﻠﯩﻘﯩﺪﺍ)"
 
-#: ../data/simple-scan.schemas.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+"قەغەزنىڭ ئوندىن بىر مىللىمېتىرلىق ئېگىزلىكى (ياكى قەغەزنى ئۆزلۈكىدىن بايقاش "
+"ئۈچۈن 0 )"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "ئاخىرقى قېتىم تەسۋىر يايغان رەسىمنىڭ ئېنىقلىقى"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
 msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr "ئالدىنقى قېتىم سكەنلىگەن رەسىمنىڭ DPI (چېكىت ھەر دىيۇم) ئېنىقلىقى"
+msgstr "ئاخىرقى قېتىم تەسۋىر يايغان رەسىمنىڭ ئېنىقلىقى (چېكىت ھەر دىيۇيم)"
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "DPI (چېكىت ھەر دىيۇم) رەسىملەرگە ئىشلىتىدىغان قىممەت"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "تېكىست تەسۋىر يېيىشنىڭ ئېنىقلىقى"
 
-#: ../data/simple-scan.schemas.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "DPI (چېكىت ھەر دىيۇم) تېكستلارغا ئىشلىتىدىغان قىممەت"
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"سكەنلىگەن رەسىمنىڭ دىيۇم كەڭلىكى. بۇنىڭ قىممىتى ئەڭ ئاخىرقى قېتىم سىكەنلىگەن "
-"بەتنىڭ قىممىتىگە ماس كىلىدۇ."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "سۈرەت تەسۋىر يېيىشنىڭ ئېنىقلىقى"
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "DPI (چېكىت ھەر دىيۇم) رەسىملەرگە ئىشلىتىدىغان قىممەت"
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
-msgstr "سكەنلىگەن رەسىمنىڭ تىپى"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "شولالايدىغان بەت يۈزى"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "بەت گىرۋىكىنى تەسۋىرگە ئېلىش."
 
-#: ../data/simple-scan.schemas.in.h:23
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "ﺋﺎﺭﺧﯩﭙﻼﺭ ﺳﺎﻗﻠﯩﻨﺪﯨﻐﺎﻥ ﻣﯘﻧﺪﻩﺭﯨﺠﻪ"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
 msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
+"The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
-"سكەنلىگەن رەسىمنىڭ تىپى. تېكىست ھۆججەتلەر ئۈچۈن ‹تېكىست›، رەسىملەر ئۈچۈن "
-"ر‹رەسىم›.  بۇ سەپلىمە سكەن ئېنىقلىقىنى، رەڭ ۋە كېيىنكى باسقۇچلارنى "
-"بەلگىلەيدۇ."
+"ھۆججەتلەرنى ساقلايدىغان مۇندەرىجە. ئەگەر تەڭشەلمىگەن بولسا كۆڭۈلدىكى "
+"ئەھۋالدا پۈتۈكلىرىمگە ساقلايدۇ."
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
-msgstr "سىكەنلىگەن رەسىمنىڭ دىيۇم كەڭلىكى"
-
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
-msgstr "دىيۇم كۆزنەك ئېگىزلىكى"
-
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
-msgstr "دىيۇم كۆزنەك كەڭلىكى"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
-msgstr "سكەننېر مەۋجۇت ئەمەس. سىكەننېرنى چېتىڭ"
+msgstr "شولالىغۇچ يوق، ئۇنى چېكىڭ."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
-msgstr "سكەننېر بىلەن ئۇلانما باغلىغىلى بولمىدى"
+msgstr "شولالىغۇچ بىلەن باغلىنالمىدى"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
-msgstr "سكەن جەريانىنى قوزغاتقىلى بولمىدى"
+msgstr "تەسۋىر يېيىشنى باشلىيالمىدى"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
-msgstr "سكەننېر بىلەن ئالاقە باغلاشتا خاتالىق كۆرۈلدى"
+msgstr "شۇلالىغۇچ بىلەن ئالاقە قىلىۋاتقاندا خاتالىق كۆرۈلدى"
+
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "نەشرىنى كۆرسىتىدۇ"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "سازلاش ئۇچۇرلىرىنى كۆرسىتىدۇ"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+"كونا نەشىردىكى ئاددى تەسۋىرگە ئېلىش ئارقىلىق قىلىنغان PDF ھۆججىتىنى ئوڭشاش."
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
-msgstr "سكەنلەش مەغلۇپ بولدى"
+msgstr "شولالىيالمىدى"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
-msgstr "سكەنلىگەن ھۆججەت"
+msgstr "شۇلالىغان پۈتۈك"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
-msgstr ""
-"ئىشلىتىلىشى\n"
-"%s[ئەسۋاب...] - سكەن قورالى"
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[ئۈسكىنە...] -تەسۋىرگە ئېلىش قورالى."
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
-#, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
-msgstr ""
-"ياردەم تاللانمىلىرى:\n"
-"-d,--debug Debug-ئۇچۇرلىرىنى كۆرسىتىدۇ\n"
-"-v,--نۇسخا نۇسخا نۇمۇرىنى كۆرسىتىدۇ\n"
-"-h,--ياردەم ياردەم تاللانمىلىرىنى كۆرسىتىدۇ\n"
-"-help-all ھەممە ياردەم تاللانمىلىرىنى كۆرسىتىدۇ\n"
-"-help-gtk GTK+ تاللانمىلىرىنى كۆرسىتىدۇ"
-
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
+msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
-"GTk+ تاللانمىلىرى:\n"
-"--class= كۆزنەك باشقۇرغۇچى ئىشلىتىدىغان پروگگرام تۈرى\n"
-"--name=كۆزنەك باشقۇرغۇچى ئىشلىتىدىغان نام\n"
-"--screen= ئشلىتىلىدغان X ئېكرانى\n"
-"--sync X- ماس قەدەملەشتۈرۈشنى قوزغىتىشنى ئىجرا قىلىش\n"
-"--gtk-module باشقا بىر GTK+ Module نى قوزغىتىش\n"
-"--g-fatal-warnigs ھەممە ئاگاھلاندۇرۇشلار خەتەرگە ئايلىندۇ"
+"«%s --help» كىرگۈزسىڭىز بۇيرۇق قۇرىدا ئىشلەتكىلى بولىدىغان بارلىق "
+"تاللانمىلارنى كۆرەلەيسىز."
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "سكەنلىگەن ھۆججەت.pdf"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
-msgstr "»%s« كىرىش ئۈچۈن ئىشلەتكۈچى نامى ۋە مەخپى نۇمۇر كېرەك"
+msgstr "«%s» نى زىيارەت قىلىش ئۈچۈن ئىشلەتكۈچى ئاتى ۋە ئىم كېرەك"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
-msgstr "سكەننېر تېپىلمىدى"
+msgstr "شولالىغۇچ بايقالمىدى"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
-msgstr "سكەننېرنىڭ چېتىقلىقىنى ھەم يېنىقلىقىنى تەكشۈرۈپ بېقىڭ"
-
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr "PDF (كۆپ بەتلىك ھۆججەتلەر)"
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr "JPEG (پىرسلانغان)"
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr "PNG (خورىماس)"
+msgstr "شولالىغۇچنى چېتىپ توك مەنبەسىنى ئېچىڭ"
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
-msgstr "...گە ساقلاش"
+msgstr "باشقا ئاتتا ساقلا…"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
-msgstr "رەسىم ھۆججەتلەر"
+msgstr "سۈرەت ھۆججەتلەر"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
-msgstr "بارلىق ھۆججەتلەر"
+msgstr "ھەممە ھۆججەتلەر"
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
-msgstr "ھۆججەتشەكلىنى تاللاش(_T)"
+msgstr "ھۆججەت شەكلىنى تاللا(_T)"
+
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF (كۆپ بەتلىك پۈتۈكلەر)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (پىرىسلانغان)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (خورىماس)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
-msgstr "ئارخىپنى ساقلىغىلى بولمىدى"
+msgstr "ھۆججەتنى ساقلىيالمىدى"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
-msgstr ""
+msgstr "ساقلانمىسا، ئۆزگەرتىشلەرنىڭ ھەممىسى مەڭگۈلۈككە يوقىلىدۇ"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
-msgstr ""
+msgstr "ھازىرقى پۈتۈكنى ساقلىسۇنمۇ؟"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
-msgstr ""
+msgstr "ئۆزگەرتىشنى تاشلىۋەت"
+
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "كۆرۈنمە رەسىمنى ساقلىغىلى بولمىدى."
 
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
-msgstr "رەسىمنى ئالدىن كۆرۈش پروگگراممىسنى قوزغاتقىلى بولمىدى"
+msgstr "رەسىمنى ئالدىن كۆزىتىدىغان ئەپنى ئاچالمىدى"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
 msgstr "ياردەم ھۆججىتىنى ئاچقىلى بولمىدى"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -581,91 +613,194 @@ msgid ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
-"بۇ بىر ئەركىن دىتال، سىز بۇنى تارقاتسىڭىز ياكى\n"
+"بۇ بىر ئەركىن يۇمشاق دىتال، سىز بۇنى تارقاتسىڭىز ياكى\n"
 "ئۆزگەرتسىڭىز بۇلىدۇ، ئەمما Free Software Foundation \n"
 "دىن بەلگىلەنگەن GNU General Public نىڭ قائىدىسىگە رىئايە\n"
-"قىلىشىڭىز لازىم: ئۈچۈنچى نۇسخىسىدا ياكى ئۇنىڭ كەينىدىكى \n"
-"بۇسخىسدا.\n"
-"بۇ پروگگرام ھېچقانداق بىر كاپالەتنى ئۈستىگە ئالمايدۇ،\n"
+"قىلىشىڭىز لازىم: ئۈچىنچى نۇسخىسىدا ياكى ئۇنىڭ كەينىدىكى \n"
+"نۇسخىسدا.\n"
+"بۇ پروگرامما ھېچقانداق بىر كاپالەتنى ئۈستىگە ئالمايدۇ،\n"
 "ھەم بۇنى سېتشقا كاپالەتلىك قىلمايدۇ، بۇ بىر سىزنىڭ \n"
 "ئشىلتىشىڭىز ئۈچۈن ياسالغان پروگگرام.\n"
 "بۇ توغرىسىدىكى ئۇچۇرلارنى GNU General Public License \n"
 "دىن ئۇقۇڭ.\n"
 "\n"
-"سىز بۇ پروگگىرام بىلەن بىر GNU General Public License\n"
-"نىڭ كوپىسىنى ئېرىشكەن بولىشىڭىز مۇمكىن، بولمىسا ئۇنى \n"
+"سىز بۇ پىروگرامما بىلەن بىر GNU General Public License\n"
+"نىڭ كۆپەيتىلمىسىگە ئېرىشكەن بولۇشىڭىز مۇمكىن، بولمىسا ئۇنى \n"
 "<http://www.gnu.org/licenses/> دا تاپالايسىز."
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
-msgstr "Simple Scan توغرىسىدا"
+msgstr "Simple Scan ھەققىدە"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
-msgstr "ئاددى بولغان ھۆججەت سكەنلەش قورالى"
+msgstr "ئاددى بولغان پۈتۈك تەسۋىر يېيىش قورالى"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  azimat https://launchpad.net/~azimat-uigur"
+"  BULBUL https://launchpad.net/~bulbul-mm\n"
+"  Burkut https://launchpad.net/~burkut-k\n"
+"  Gheyret T.Kenji https://launchpad.net/~gheyretkenji\n"
+"  Robert Ancell https://launchpad.net/~robert-ancell\n"
+"  Sahran https://launchpad.net/~sahran\n"
+"  Shatur.uigur https://launchpad.net/~azimat\n"
+"  azimat https://launchpad.net/~azimat-uigur\n"
+"  umar tumur https://launchpad.net/~umar-tumur"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
-msgstr ""
+msgstr "ئاخىرلاشتۇرۇشتىن ئاۋۋال ھازىرقى پۈتۈكنى ساقلىسۇنمۇ؟"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
-msgstr ""
+msgstr "ساقلىماي ئاخىرلاشتۇر"
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (كۆڭۈلدىكى)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#: ../src/ui.vala:1292
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (دەسلەپكى نۇسخا)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
-#, c-format
-msgid "%d dpi"
-msgstr "%d dpi"
-
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (يۇقىرى ئېنىقلىق)"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
-msgstr "%d dpi (كۆڭۈلدىكى)"
+msgid "%d dpi"
+msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
 msgstr "ھۆججەت تېپىلمىدى"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
-msgstr "قاچىلانمىڭىزنى تەكشۈرۈپ بېقىڭ"
+msgstr "ئورنىتىشىڭىزنى تەكشۈرۈپ بېقىڭ"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
-msgstr "سكەننېرنى ئالماشتۇرۇڭ(_S)"
+msgstr "شولالىغۇچ ئالماشتۇر(_S)"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
-msgstr ""
+msgstr "ئاپتوماتىك"
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
-msgstr "سكەنلىگەن ھۆججەت.pdf"
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr "قارىراق"
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr "يورۇقراق"
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr "تۆۋەن"
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr "تېخىمۇ كۆپ"
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr "ئەڭ كىچىك"
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr "ئەڭ چوڭ"
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "پۈتۈكنى ساقلاۋاتىدۇ…"
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "ساقلاۋاتقىنى %d/%d - بەت"
+
+#~ msgid ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ msgstr ""
+#~ "سكەنلىگەن بەتنىڭ سىكەن يۆلىنشىگە بولغان ماسلىقى تۆۋەندىكىدىن بىرسى بۇلىشى "
+#~ "مۇنكىن: ‹ئۈستىدىن ئاستىغا›، ‹ئاستىدىن ئۈستىگە›، ‹سولدىن ئوڭغا›، ‹ئوڭدىن "
+#~ "سولغا›"
+
+#~ msgid ""
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
+#~ msgstr ""
+#~ "سكەنلىگەن رەسىمنىڭ تىپى. تېكىست ھۆججەتلەر ئۈچۈن ‹تېكىست›، رەسىملەر ئۈچۈن "
+#~ "ر‹رەسىم›.  بۇ سەپلىمە سكەن ئېنىقلىقىنى، رەڭ ۋە كېيىنكى باسقۇچلارنى "
+#~ "بەلگىلەيدۇ."
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "ئىشلىتىلىشى\n"
+#~ "%s[ئەسۋاب...] - سكەن قورالى"
+
+#, c-format
+#~ msgid ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+#~ msgstr ""
+#~ "ياردەم تاللانمىلىرى:\n"
+#~ "-d,--debug Debug-ئۇچۇرلىرىنى كۆرسىتىدۇ\n"
+#~ "-v,--نۇسخا نۇسخا نۇمۇرىنى كۆرسىتىدۇ\n"
+#~ "-h,--ياردەم ياردەم تاللانمىلىرىنى كۆرسىتىدۇ\n"
+#~ "-help-all ھەممە ياردەم تاللانمىلىرىنى كۆرسىتىدۇ\n"
+#~ "-help-gtk GTK+ تاللانمىلىرىنى كۆرسىتىدۇ"
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "GTk+ تاللانمىلىرى:\n"
+#~ "--class= كۆزنەك باشقۇرغۇچى ئىشلىتىدىغان پروگگرام تۈرى\n"
+#~ "--name=كۆزنەك باشقۇرغۇچى ئىشلىتىدىغان نام\n"
+#~ "--screen= ئشلىتىلىدغان X ئېكرانى\n"
+#~ "--sync X- ماس قەدەملەشتۈرۈشنى قوزغىتىشنى ئىجرا قىلىش\n"
+#~ "--gtk-module باشقا بىر GTK+ Module نى قوزغىتىش\n"
+#~ "--g-fatal-warnigs ھەممە ئاگاھلاندۇرۇشلار خەتەرگە ئايلىندۇ"
diff --git a/po/uk.po b/po/uk.po
index 36314f4..c26d6e2 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,326 +7,347 @@ msgid ""
 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-08-16 11:45+0000\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-07-23 11:28+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-22 04:48+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Просте сканування"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr "A_4"
+msgid "_Document"
+msgstr "Д_окумент"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr "С_канування"
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "Одинарна _сторінка"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:10
 msgid "All Pages From _Feeder"
 msgstr "Всі сторінки з _лотка"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr "Зворот"
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
-msgstr "Обрізати"
+msgid "_Stop Scan"
+msgstr "П_рипинити сканування"
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr "Обрізати позначену сторінку"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr "Передній бік"
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr "Передній і зворотний боки"
-
-#. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr "Le_gal"
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr "Створити"
-
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr "Розмір сторінки:"
+msgid "Text"
+msgstr "Текстовий"
 
 #. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
+#: ../data/simple-scan.ui.h:16
 msgid "Photo"
 msgstr "Фотографія"
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr "Параметри"
-
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
-msgstr "Обернути ліворуч"
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr "_Надіслати ел. поштою"
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr "Обернути праворуч"
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr "С_торінка"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
+#: ../data/simple-scan.ui.h:22
 msgid "Rotate _Left"
 msgstr "Обернути _ліворуч"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
+#: ../data/simple-scan.ui.h:24
 msgid "Rotate _Right"
 msgstr "Обернути п_раворуч"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Обертати сторінку ліворуч (проти годинникової стрілки)"
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "_Обрізати"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr "Обертати сторінку праворуч (за годинниковою стрілкою)"
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "_Без обрізання"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
 
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "_Letter"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "Le_gal"
+
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr "Зберегти"
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr "Зберегти документ до файла"
+msgid "_Custom"
+msgstr "_Нетипові"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr "С_канування"
+msgid "_Rotate Crop"
+msgstr "_Обернути область обрізання"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
-msgstr "Сканувати"
+msgid "Move Left"
+msgstr "Пересунути ліворуч"
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr "_Джерело даних сканування:"
+msgid "Move Right"
+msgstr "Пересунути праворуч"
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr "Бік сканування:"
+msgid "_Help"
+msgstr "_Довідка"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
-msgstr "Сканувати одну сторінку"
-
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr "Просте сканування"
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr "Одинарна _сторінка"
+msgid "_Contents"
+msgstr "_Вміст"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
 msgstr "Почати новий документ"
 
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "Створити"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "Сканувати одну сторінку"
+
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
-msgstr "Зупинити"
+msgid "Scan"
+msgstr "Сканувати"
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr "Зберегти документ до файла"
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "Зберегти"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
 msgid "Stop the current scan"
 msgstr "Припинити поточне сканування"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr "Текстовий"
-
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr "_Уповноваження"
+msgid "Stop"
+msgstr "Зупинити"
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
-msgstr "_Вміст"
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "Обертати сторінку ліворуч (проти годинникової стрілки)"
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr "_Обрізати"
+msgid "Rotate Left"
+msgstr "Обернути ліворуч"
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr "_Нетипові"
+msgid "Rotate the page to the right (clockwise)"
+msgstr "Обертати сторінку праворуч (за годинниковою стрілкою)"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr "Д_окумент"
+msgid "Rotate Right"
+msgstr "Обернути праворуч"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "Обрізати позначену сторінку"
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
-msgstr "_Надіслати ел. поштою"
+msgid "Crop"
+msgstr "Обрізати"
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr "_Довідка"
+msgid "_Username for resource:"
+msgstr "_Користувач ресурсу:"
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr "_Letter"
+msgid "_Password:"
+msgstr "_Пароль:"
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr "_Без обрізання"
+msgid "_Authorize"
+msgstr "_Уповноваження"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr "С_торінка"
+msgid "Preferences"
+msgstr "Налаштування"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr "_Пароль:"
+msgid "Scan S_ource:"
+msgstr "_Джерело даних сканування:"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
-msgstr "Роздільна здатність _фотографій:"
+msgid "_Text Resolution:"
+msgstr "Роздільна здатність _тексту:"
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr "_Обернути область обрізання"
+msgid "_Photo Resolution:"
+msgstr "Роздільна здатність _фотографій:"
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
-msgstr "П_рипинити сканування"
+msgid "Scan Side:"
+msgstr "Бік сканування:"
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
-msgstr "Роздільна здатність _тексту:"
+msgid "Page Size:"
+msgstr "Розмір сторінки:"
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
-msgstr "_Користувач ресурсу:"
+msgid "Brightness:"
+msgstr "Яскравість:"
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
-msgstr "Сканувати документи"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr "Контрастність:"
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
-msgstr "Пристрій сканування"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr "Якість:"
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
-msgstr "Напрямок сканування"
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "Передній і зворотний боки"
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
-msgstr "Каталог збережених файлів"
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "Передній бік"
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
-msgstr "Висота паперу у десятих міліметра"
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "Зворот"
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr "Висота сканованого зображення у пікселях"
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "Сканувати документи"
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
-msgstr "Бік сторінки, який слід сканувати"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "Ширина вікна у пікселях"
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
-msgstr "Роздільна здатність для сканування фотографій"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "Висота вікна у пікселях"
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
-msgstr "Роздільна здатність для сканування тексту"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "Якщо позначено, вікно програми буде максимізовано"
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
-msgstr "Роздільна здатність попереднього сканованого зображення"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "Пристрій сканування"
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
 msgstr "Пристрій SANE, з якого слід отримувати зображення."
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
-msgstr "Якщо позначено, вікно програми буде максимізовано"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "Тип документа, який ви скануєте"
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
-"Напрямок сканування сторінки. Може мати такі значення: «top-to-bottom» "
-"(згори вниз), «bottom-to-top» (знизу вгору), «left-to-right» (зліва "
-"праворуч), «right-to-left» (справа ліворуч)"
+"Тип документа, який сканується. За значенням цього параметра визначається "
+"роздільна здатність сканування, кольори та способи остаточної обробки."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "Напрямок сканування"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "Напрямок сканування на сканованій сторінці."
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "Ширина сканованого зображення у пікселях"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
 msgstr ""
-"Каталог, до якого слід зберігати файли. Якщо не буде вказано, типовим "
-"вважатиметься каталог документів."
+"Ширина сканованого зображення у пікселях. Це значення буде оновлено на те, "
+"яке було використано для попереднього зображення."
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "Висота сканованого зображення у пікселях"
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
@@ -334,245 +355,248 @@ msgstr ""
 "Висота сканованого зображення у пікселях. Це значення буде оновлено на те, "
 "яке було використано для попереднього зображення."
 
-#: ../data/simple-scan.schemas.in.h:15
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "Ширина паперу у десятих міліметра"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
-"Висота паперу у десятих міліметра (або 0 для автоматичного визначення паперу)"
+"Ширина паперу у десятих міліметра (або 0 для автоматичного визначення паперу)"
 
-#: ../data/simple-scan.schemas.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "Висота паперу у десятих міліметра"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
 msgstr ""
-"Бік паперу,  який слід сканувати. Може мати такі значення: 'both' 'front' "
-"'back'"
+"Висота паперу у десятих міліметра (або 0 для автоматичного визначення паперу)"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr "Яскравість сканування"
 
-#: ../data/simple-scan.schemas.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "Коригування яскравості від -100 до 100 (0 — не коригувати)"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr "Контрастність сканування"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "Коригування контрастності від -100 до 100 (0 — не коригувати)"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "Роздільна здатність попереднього сканованого зображення"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
 msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr ""
 "Роздільна здатність у точках на дюйм попереднього сканованого зображення."
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "Роздільна здатність у точках на дюйм для сканування фотографій."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "Роздільна здатність для сканування тексту"
 
-#: ../data/simple-scan.schemas.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "Роздільна здатність у точках на дюйм для сканування тексту."
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr ""
-"Ширина сканованого зображення у пікселях. Це значення буде оновлено на те, "
-"яке було використано для попереднього зображення."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "Роздільна здатність для сканування фотографій"
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr ""
-"Ширина паперу у десятих міліметра (або 0 для автоматичного визначення паперу)"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "Роздільна здатність у точках на дюйм для сканування фотографій."
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
-msgstr "Тип документа, який ви скануєте"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "Бік сторінки, який слід сканувати"
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
-msgstr ""
-"Тип документа, який ви скануєте. «text» — текстовий документ, «photo» — "
-"фотографії. Значення цього параметра впливає на роздільну здатність "
-"сканування, використання кольорів та остаточну обробку зображення."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "Бік сторінки, який буде скановано."
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
-msgstr "Ширина паперу у десятих міліметра"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "Каталог збережених файлів"
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
-msgstr "Ширина сканованого зображення у пікселях"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+"Каталог, до якого слід зберігати файли. Якщо не буде вказано, типовим "
+"вважатиметься каталог документів."
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
-msgstr "Висота вікна у пікселях"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr "Значення якості, яке буде використано під час стискання JPEG"
 
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
-msgstr "Ширина вікна у пікселях"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr "Значення якості, яке буде використано під час стискання JPEG."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 "Не вдалося виявити жодного сканера. Будь ласка, з’єднайте сканер з "
 "комп’ютером."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
 msgstr "Не вдалося з’єднатися зі сканером"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
 msgstr "Не вдалося розпочати сканування"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
 msgstr "Помилка під час спроби обміну даними зі сканером"
 
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Показати версію випуску"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Показувати діагностичні повідомлення"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+"Виправити файли PDF, створені за допомогою застарілих версій Simple Scan"
+
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
 msgstr "Помилка сканування"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
 msgstr "Сканований документ"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
-msgstr ""
-"Користування:\n"
-"  %s [ПРИСТРІЙ...] — інструмент сканування"
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[ПРИСТРІЙ...] — програма для сканування"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
+msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
-"Додаткові параметри:\n"
-"  -d, --debug                     Виводити діагностичні повідомлення\n"
-"  -v, --version                   Показати відомості щодо випуску\n"
-"  -h, --help                      Показати довідку щодо параметрів\n"
-"  --help-all                      Показати всі параметри\n"
-"  --help-gtk                      Показати параметри GTK+"
-
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
-#, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
-msgstr ""
-"Параметри GTK+:\n"
-"  --class=КЛАС                    Клас програми, який використовуватиметься "
-"інструментом керування вікнами\n"
-"  --name=НАЗВА                    Назва програми, що використовуватиметься "
-"інструментом керування вікнами\n"
-"  --screen=ЕКРАН                  Екран сервера X, яким слід скористатися\n"
-"  --sync                          Синхронізувати виклики X\n"
-"  --gtk-module=МОДУЛІ             Завантажити додаткові модулі GTK+\n"
-"  --g-fatal-warnings              Завершувати роботу у разі появи попереджень"
+"Виконайте « %s --help», щоб побачити повний перелік доступних параметрів "
+"командного рядка."
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "Сканований документ.pdf"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Для доступу до «%s» слід вказати ім’я користувача та пароль"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
 msgstr "Сканерів не виявлено"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
 msgstr "Будь ласка, перевірте, чи з’єднано ваш сканер і чи увімкнено його"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr "PDF (багатосторінковий документ)"
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr "JPEG (стиснений)"
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr "PNG (без втрат)"
-
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
 msgstr "Зберегти як..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
 msgstr "Файли зображень"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
 msgstr "Всі файли"
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
 msgstr "Вибрати _тип файла"
 
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF (багатосторінковий документ)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (стиснений)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (без втрат)"
+
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
 msgstr "Не вдалося зберегти файл"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Якщо ви не збережете внесені зміни, їх буде втрачено остаточно."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
 msgstr "Зберегти поточний документ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
 msgstr "Відкинути зміни"
 
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "Не вдалося зберегти зображення для попереднього перегляду"
+
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
 msgstr "Не вдалося запустити програму для перегляду зображення"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
 msgstr "Не вдалося відкрити файл довідки"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -601,77 +625,182 @@ msgstr ""
 "<http://www.gnu.org/licenses/>, щоб дізнатися про подальші дії."
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
 msgstr "Про «Просте сканування»"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
 msgstr "Інструмент для спрощення сканування документів"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Sergiy Gavrylov https://launchpad.net/~gavro\n"
+"  Serhey Kusyumoff (Сергій Кусюмов) https://launchpad.net/~sergemine\n"
 "  Yuri Chornoivan https://launchpad.net/~yurchor-gmail\n"
 "  passtas https://launchpad.net/~passtas"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
 msgstr "Зберегти документ перед виходом?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
 msgstr "Вийти без збереження"
 
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d т/д (типова)"
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#: ../src/ui.vala:1292
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d т/д (чернетка)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
-#, c-format
-msgid "%d dpi"
-msgstr "%d т/д"
-
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d т/д (висока роздільність)"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
-msgstr "%d т/д (типова)"
+msgid "%d dpi"
+msgstr "%d т/д"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
 msgstr "Не виявлено таких файлів"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
 msgstr "Будь ласка, перевірте, чи належним чином встановлено програму"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
 msgstr "З_мінити сканер"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
-msgstr "Сканований документ.pdf"
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr "темніше"
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr "світліше"
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr "менше"
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr "більше"
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr "Мінімальна"
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr "Максимальна"
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "Збереження документа…"
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "Зберігаємо сторінку %d з %d"
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "Користування:\n"
+#~ "  %s [ПРИСТРІЙ...] — інструмент сканування"
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "Параметри GTK+:\n"
+#~ "  --class=КЛАС                    Клас програми, який використовуватиметься "
+#~ "інструментом керування вікнами\n"
+#~ "  --name=НАЗВА                    Назва програми, що використовуватиметься "
+#~ "інструментом керування вікнами\n"
+#~ "  --screen=ЕКРАН                  Екран сервера X, яким слід скористатися\n"
+#~ "  --sync                          Синхронізувати виклики X\n"
+#~ "  --gtk-module=МОДУЛІ             Завантажити додаткові модулі GTK+\n"
+#~ "  --g-fatal-warnings              Завершувати роботу у разі появи попереджень"
+
+#~ msgid ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ msgstr ""
+#~ "Напрямок сканування сторінки. Може мати такі значення: «top-to-bottom» "
+#~ "(згори вниз), «bottom-to-top» (знизу вгору), «left-to-right» (зліва "
+#~ "праворуч), «right-to-left» (справа ліворуч)"
+
+#~ msgid ""
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
+#~ msgstr ""
+#~ "Тип документа, який ви скануєте. «text» — текстовий документ, «photo» — "
+#~ "фотографії. Значення цього параметра впливає на роздільну здатність "
+#~ "сканування, використання кольорів та остаточну обробку зображення."
+
+#, c-format
+#~ msgid ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+#~ msgstr ""
+#~ "Додаткові параметри:\n"
+#~ "  -d, --debug                     Виводити діагностичні повідомлення\n"
+#~ "  -v, --version                   Показати відомості щодо випуску\n"
+#~ "  -h, --help                      Показати довідку щодо параметрів\n"
+#~ "  --help-all                      Показати всі параметри\n"
+#~ "  --help-gtk                      Показати параметри GTK+"
+
+#~ msgid ""
+#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ msgstr ""
+#~ "Бік паперу,  який слід сканувати. Може мати такі значення: 'both' 'front' "
+#~ "'back'"
diff --git a/po/ur.po b/po/ur.po
index fa1d309..bed12e3 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -7,35 +7,34 @@ msgid ""
 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-10-27 08:21+0000\n"
-"Last-Translator: Launchpad Translations Administrators "
-"<rosetta@launchpad.net>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-04-17 06:12+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Urdu <ur@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-10-28 05:18+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
 msgstr ""
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
+msgid "_Document"
 msgstr ""
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
+msgid "Sc_an"
 msgstr ""
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
+msgid "Single _Page"
 msgstr ""
 
 #. Toolbar scan menu item to scan all pages from a document feeder
@@ -43,501 +42,545 @@ msgstr ""
 msgid "All Pages From _Feeder"
 msgstr ""
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr ""
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
+msgid "_Stop Scan"
 msgstr ""
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr ""
+msgid "Text"
+msgstr "عبارت"
 
-#. Combo box label for scanning the front side of a page
+#. Combo box label for photo scan mode
 #: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr ""
+msgid "Photo"
+msgstr "تصویر"
 
-#. Combo box label for scanning both sides of a page
+#. Label on email menu item
 #: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
+msgid "_Email"
 msgstr ""
 
-#. Radio button for cropping to page to US legal size
+#. Page menu (contains action for each page, e.g. delete, crop)
 #: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr ""
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
+msgid "_Page"
 msgstr ""
 
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
+#. Menu item to rotate page to left (anti-clockwise)
+#: ../data/simple-scan.ui.h:22
+msgid "Rotate _Left"
 msgstr ""
 
-#. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
-msgid "Photo"
+#. Menu item to rotate page to right (clockwise)
+#: ../data/simple-scan.ui.h:24
+msgid "Rotate _Right"
 msgstr ""
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
 msgstr ""
 
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
 msgstr ""
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr ""
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
 
-#. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
-msgid "Rotate _Left"
-msgstr ""
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
 
-#. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
-msgid "Rotate _Right"
-msgstr ""
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
 msgstr ""
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
 msgstr ""
 
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr ""
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
+msgid "_Custom"
 msgstr ""
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
+msgid "_Rotate Crop"
 msgstr ""
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
+msgid "Move Left"
 msgstr ""
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
+msgid "Move Right"
 msgstr ""
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
+msgid "_Help"
 msgstr ""
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
+msgid "_Contents"
 msgstr ""
 
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
+#. Tooltip for new document button
+#: ../data/simple-scan.ui.h:54
+msgid "Start a new document"
 msgstr ""
 
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr ""
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "نیا"
 
-#. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
-msgid "Start a new document"
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
 msgstr ""
 
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
+msgid "Scan"
 msgstr ""
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
-msgid "Stop the current scan"
+msgid "Save document to a file"
 msgstr ""
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "محفوظ کریں"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
+msgid "Stop the current scan"
 msgstr ""
 
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr ""
+msgid "Stop"
+msgstr "رکیۓ"
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
+msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
+msgid "Rotate Left"
 msgstr ""
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
+msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
+msgid "Rotate Right"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
 msgstr ""
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
+msgid "Crop"
 msgstr ""
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
+msgid "_Username for resource:"
 msgstr ""
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
+msgid "_Password:"
 msgstr ""
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
+msgid "_Authorize"
 msgstr ""
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr ""
+msgid "Preferences"
+msgstr "ترجیحات"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
+msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
+msgid "_Text Resolution:"
 msgstr ""
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
+msgid "_Photo Resolution:"
 msgstr ""
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
+msgid "Scan Side:"
 msgstr ""
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
+msgid "Page Size:"
 msgstr ""
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
+msgid "Brightness:"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
-msgstr ""
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "پیچھے"
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 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
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
 msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
 msgstr ""
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
 msgstr ""
 
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr ""
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr ""
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
 msgstr ""
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
 msgstr ""
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
+msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
-#, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr ""
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr ""
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr ""
-
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
 msgstr ""
 
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr ""
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr ""
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
 msgstr ""
 
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr ""
+
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -554,73 +597,112 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
+"Launchpad Contributions:\n"
+"  Midhat Ali https://launchpad.net/~midhatali\n"
+"  Shehzad Ashiq Ali https://launchpad.net/~shehzadashiq\n"
+"  Shoaib Mirza https://launchpad.net/~monymirza"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
 msgstr ""
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
 #, c-format
-msgid "%d dpi (draft)"
+msgid "%d dpi (default)"
 msgstr ""
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1292
 #, c-format
-msgid "%d dpi"
+msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
+msgid "%d dpi"
 msgstr ""
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
 msgstr ""
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr ""
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr ""
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr ""
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr ""
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr ""
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr ""
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr ""
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/uz.po b/po/uz.po
new file mode 100644
index 0000000..21350ba
--- /dev/null
+++ b/po/uz.po
@@ -0,0 +1,708 @@
+# Uzbek translation for simple-scan
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the simple-scan package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: simple-scan\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-04-17 06:12+0000\n"
+"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"Language-Team: Uzbek <uz@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: 2013-09-13 05:46+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
+
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Simple Scan"
+
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: ../data/simple-scan.ui.h:4
+msgid "_Document"
+msgstr "_Dokument"
+
+#. Scan menu item
+#: ../data/simple-scan.ui.h:6
+msgid "Sc_an"
+msgstr "_Skan qilish"
+
+#. Toolbar scan menu item to scan a single page from the scanner
+#: ../data/simple-scan.ui.h:8
+msgid "Single _Page"
+msgstr ""
+
+#. Toolbar scan menu item to scan all pages from a document feeder
+#: ../data/simple-scan.ui.h:10
+msgid "All Pages From _Feeder"
+msgstr ""
+
+#. Menu entry to stop current scan
+#: ../data/simple-scan.ui.h:12
+msgid "_Stop Scan"
+msgstr ""
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:14
+msgid "Text"
+msgstr "Matn"
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:16
+msgid "Photo"
+msgstr "Rasm"
+
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr "_Email"
+
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr ""
+
+#. Menu item to rotate page to left (anti-clockwise)
+#: ../data/simple-scan.ui.h:22
+msgid "Rotate _Left"
+msgstr "Chapga burish"
+
+#. Menu item to rotate page to right (clockwise)
+#: ../data/simple-scan.ui.h:24
+msgid "Rotate _Right"
+msgstr "_O'nga burish"
+
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "_Kesish"
+
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "_Yoʻq"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "_Xat"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr ""
+
+#. Radio button for cropping page to 4x6 inch
+#: ../data/simple-scan.ui.h:40
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
+
+#. Radio button for cropping to custom page size
+#: ../data/simple-scan.ui.h:42
+msgid "_Custom"
+msgstr ""
+
+#. Menu item to rotate the crop area
+#: ../data/simple-scan.ui.h:44
+msgid "_Rotate Crop"
+msgstr ""
+
+#. Menu item to move the selected page to the left
+#: ../data/simple-scan.ui.h:46
+msgid "Move Left"
+msgstr ""
+
+#. Menu item to move the selected page to the right
+#: ../data/simple-scan.ui.h:48
+msgid "Move Right"
+msgstr ""
+
+#. Label on help menu
+#: ../data/simple-scan.ui.h:50
+msgid "_Help"
+msgstr "_Yordam"
+
+#. Help|Contents menu
+#: ../data/simple-scan.ui.h:52
+msgid "_Contents"
+msgstr "_Tarkibi"
+
+#. Tooltip for new document button
+#: ../data/simple-scan.ui.h:54
+msgid "Start a new document"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "Yangi"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr ""
+
+#. Label on scan toolbar item
+#: ../data/simple-scan.ui.h:59
+msgid "Scan"
+msgstr "Skan qilish"
+
+#. Tooltip for save toolbar button
+#: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "Saqlash"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
+msgid "Stop the current scan"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:65
+msgid "Stop"
+msgstr "Toʻxtatish"
+
+#. Tooltip for rotate left (counter-clockwise) button
+#: ../data/simple-scan.ui.h:67
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr ""
+
+#. Label on rotate page left (anti-clockwise) item
+#: ../data/simple-scan.ui.h:69
+msgid "Rotate Left"
+msgstr "Chapga burish"
+
+#. Tooltip for rotate right (clockwise) button
+#: ../data/simple-scan.ui.h:71
+msgid "Rotate the page to the right (clockwise)"
+msgstr ""
+
+#. Label on rotate page right (clockwise) item
+#: ../data/simple-scan.ui.h:73
+msgid "Rotate Right"
+msgstr "O'nga burish"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:75
+msgid "Crop"
+msgstr "Kesish"
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:77
+msgid "_Username for resource:"
+msgstr ""
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:79
+msgid "_Password:"
+msgstr "_Maxfiy soʻz:"
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:81
+msgid "_Authorize"
+msgstr ""
+
+#. Title of preferences dialog
+#: ../data/simple-scan.ui.h:83
+msgid "Preferences"
+msgstr "Мослашлар"
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:85
+msgid "Scan S_ource:"
+msgstr ""
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:87
+msgid "_Text Resolution:"
+msgstr ""
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:89
+msgid "_Photo Resolution:"
+msgstr ""
+
+#. Label beside scan side combo box
+#: ../data/simple-scan.ui.h:91
+msgid "Scan Side:"
+msgstr ""
+
+#. Label beside page size combo box
+#: ../data/simple-scan.ui.h:93
+msgid "Page Size:"
+msgstr ""
+
+#. Label beside brightness scale
+#: ../data/simple-scan.ui.h:95
+msgid "Brightness:"
+msgstr ""
+
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr ""
+
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr ""
+
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "Olidi va Orqasi"
+
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "Oldingi"
+
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "Orqaga"
+
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
+msgid "SANE device to acquire images from."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
+msgid ""
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
+msgid ""
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
+msgid ""
+"The height of scanned image in pixels. This value is updated to what the "
+"last scanned page was."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
+msgid "The resolution in dots-per-inch of the previously scanned image."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
+msgid "The resolution in dots-per-inch to use when scanning text."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr ""
+
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:814
+msgid "No scanners available.  Please connect a scanner."
+msgstr ""
+
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:844
+msgid "Unable to connect to scanner"
+msgstr ""
+
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1207
+msgid "Unable to start scan"
+msgstr ""
+
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
+msgid "Error communicating with scanner"
+msgstr ""
+
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Релиз версиясини кўрсатиш"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "Дебаг хабарларини  чоп қилиш"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:297
+msgid "Failed to scan"
+msgstr ""
+
+#. Default filename to use when saving document (and extension will be added, e.g. .jpg)
+#: ../src/simple-scan.vala:316
+msgid "Scanned Document"
+msgstr ""
+
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr ""
+
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
+#, c-format
+msgid "Run '%s --help' to see a full list of available command line options."
+msgstr ""
+"Мавжуд буйруқлар ва мосламаларнинг тўлиқ рўйхатини кўриш учун '%s --help''ни "
+"ишга туширинг."
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr ""
+
+#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
+#: ../src/ui.vala:159
+#, c-format
+msgid "Username and password required to access '%s'"
+msgstr ""
+
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:202
+msgid "No scanners detected"
+msgstr ""
+
+#. Hint to user on why there are no scanners detected
+#: ../src/ui.vala:204
+msgid "Please check your scanner is connected and powered on"
+msgstr ""
+
+#. Save dialog: Dialog title
+#: ../src/ui.vala:363
+msgid "Save As..."
+msgstr ""
+
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:377
+msgid "Image Files"
+msgstr ""
+
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:383
+msgid "All Files"
+msgstr "Hamma fayllar"
+
+#. 
+#: ../src/ui.vala:388
+msgid "Select File _Type"
+msgstr ""
+
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr ""
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr ""
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr ""
+
+#. Title of error dialog when save failed
+#: ../src/ui.vala:503
+msgid "Failed to save file"
+msgstr ""
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:526
+msgid "If you don't save, changes will be permanently lost."
+msgstr ""
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:563
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:565
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.vala:872
+msgid "Unable to open image preview application"
+msgstr ""
+
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1119
+msgid "Unable to open help file"
+msgstr ""
+
+#. The license this software is under (GPL3+)
+#: ../src/ui.vala:1130
+msgid ""
+"This program is free software: you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 3 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program.  If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+
+#. Title of about dialog
+#: ../src/ui.vala:1133
+msgid "About Simple Scan"
+msgstr "Simple Scan haqida"
+
+#. Description of program
+#: ../src/ui.vala:1136
+msgid "Simple document scanning tool"
+msgstr ""
+
+#: ../src/ui.vala:1145
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Sardorbek Pulatov https://launchpad.net/~prockrammer"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1156
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1158
+msgid "Quit without Saving"
+msgstr "Saqlamasdan chiqib ketish"
+
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (default)"
+
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1292
+#, c-format
+msgid "%d dpi (draft)"
+msgstr ""
+
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1295
+#, c-format
+msgid "%d dpi (high resolution)"
+msgstr ""
+
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
+#, c-format
+msgid "%d dpi"
+msgstr ""
+
+#. Title of dialog when cannot load required files
+#: ../src/ui.vala:1333
+msgid "Files missing"
+msgstr "Fayllar topilmadi"
+
+#. Description in dialog when cannot load required files
+#: ../src/ui.vala:1335
+msgid "Please check your installation"
+msgstr ""
+
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1403
+msgid "Change _Scanner"
+msgstr "_Skaner almashrirish"
+
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1409
+msgid "Automatic"
+msgstr "Avtomatik"
+
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr ""
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr ""
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr ""
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr ""
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr ""
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr ""
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr ""
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr ""
diff --git a/po/vi.po b/po/vi.po
index 4658219..bdf2c3a 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,547 +7,584 @@ msgid ""
 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-10-25 07:59+0000\n"
-"Last-Translator: Yang Ha Nguyen <Unknown>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-07-23 09:09+0000\n"
+"Last-Translator: Robert Ancell <robert.ancell@canonical.com>\n"
 "Language-Team: Vietnamese <vi@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-10-26 04:47+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "Quét đơn giản"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr "A_4"
+msgid "_Document"
+msgstr "_Tài liệu"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr ""
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "Trang Đơn"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:10
 msgid "All Pages From _Feeder"
 msgstr "Tất cả trang từ _Khay (Feeder)"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr ""
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
+msgid "_Stop Scan"
 msgstr ""
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr ""
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr ""
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr ""
-
-#. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr "Le_gal"
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr ""
-
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr ""
+msgid "Text"
+msgstr "Văn bản"
 
 #. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
+#: ../data/simple-scan.ui.h:16
 msgid "Photo"
 msgstr "Ảnh chụp"
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr "Tùy thích"
-
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
 msgstr ""
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr ""
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr "_Trang"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
+#: ../data/simple-scan.ui.h:22
 msgid "Rotate _Left"
 msgstr "Xoay _trái"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
+#: ../data/simple-scan.ui.h:24
 msgid "Rotate _Right"
 msgstr "Xoay _Phải"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr ""
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "_Xén"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr ""
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "_Không có"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "_Letter"
 
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "Le_gal"
+
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr ""
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr ""
+msgid "_Custom"
+msgstr "Tự _chọn"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr ""
+msgid "_Rotate Crop"
+msgstr "_Xoay phần Xén trên màn hình (_Rotate Crop)"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
+msgid "Move Left"
 msgstr ""
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr "Quét _Nguồn:"
+msgid "Move Right"
+msgstr ""
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr ""
+msgid "_Help"
+msgstr "_Trợ giúp"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
+msgid "_Contents"
 msgstr ""
 
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr "Quét đơn giản"
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr "Trang Đơn"
-
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
 msgstr ""
 
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr ""
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr ""
+
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
+msgid "Scan"
 msgstr ""
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
-msgid "Stop the current scan"
+msgid "Save document to a file"
 msgstr ""
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr "Văn bản"
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr ""
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
+msgid "Stop the current scan"
+msgstr ""
 
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr "_Xác thực"
+msgid "Stop"
+msgstr ""
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
+msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr "_Xén"
+msgid "Rotate Left"
+msgstr ""
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr "Tự _chọn"
+msgid "Rotate the page to the right (clockwise)"
+msgstr ""
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr "_Tài liệu"
+msgid "Rotate Right"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr ""
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
+msgid "Crop"
 msgstr ""
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr "_Trợ giúp"
+msgid "_Username for resource:"
+msgstr ""
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr "_Letter"
+msgid "_Password:"
+msgstr "_Mật khẩu:"
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr "_Không có"
+msgid "_Authorize"
+msgstr "_Xác thực"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr "_Trang"
+msgid "Preferences"
+msgstr "Tùy thích"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr "_Mật khẩu:"
+msgid "Scan S_ource:"
+msgstr "Quét _Nguồn:"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
+msgid "_Text Resolution:"
 msgstr ""
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr "_Xoay phần Xén trên màn hình (_Rotate Crop)"
+msgid "_Photo Resolution:"
+msgstr ""
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
+msgid "Scan Side:"
 msgstr ""
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
+msgid "Page Size:"
 msgstr ""
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
+msgid "Brightness:"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
 msgstr ""
+"Loại tài liệu đang quét hình. Tùy chọn này sẽ quyết định độ phân giải quét "
+"hình, màu và quy trình xử lý sau quét hình."
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "Hướng quét trang của máy quét hình"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 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
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
 msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
-msgstr ""
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "Bên trang cần quét hình."
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
 msgstr "Không nối được với máy quét hình"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
 msgstr "Không quét hình được"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
 msgstr "Lỗi khi giao dịch với máy quét hình"
 
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "Hiện phiên bản phát hành"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "In ra thông tin gỡ lỗi"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr ""
+"Chỉnh các tệp PDF đã được tạo ra bởi các phiên bản cũ hơn của Simple Scan"
+
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
 msgstr "Quét hình thất bại"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
 msgstr ""
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
-msgstr ""
-"Cách dùng:\n"
-"  %s [DEVICE...] - Scanning utility"
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[DEVICE...] - Công cụ quét hình"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
+msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
+"Chạy lệnh '%s --help' để xem danh sách tất cả các tùy chọn dòng lệnh."
 
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
-#, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
-msgstr ""
-"Lựa chọn GTK+ :\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "Tài liệu quét.pdf"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Tên đăng nhập và mật mã cần thiết để truy cập '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
 msgstr "Không phát hiện máy quét hình nào hết"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
 msgstr "Vui lòng kiểm tra đã cắm và bật máy quét hình chưa"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr ""
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr ""
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr ""
-
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
 msgstr "Lưu thành..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
 msgstr ""
 
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr ""
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr ""
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr ""
+
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
 msgstr "Không lưu được tệp"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
 msgstr ""
 
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "Không lưu được ảnh cho xem trước"
+
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -576,76 +613,142 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
 msgstr "Về Simple Scan"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
 msgstr "Công cụ đơn giản để quét tài liệu"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Vu Do Quynh https://launchpad.net/~vu-do-quynh\n"
-"  Yang Ha Nguyen https://launchpad.net/~cmpitg"
+"  Duong H. Nguyen https://launchpad.net/~cmpitg\n"
+"  Robert Ancell https://launchpad.net/~robert-ancell\n"
+"  Vu Do Quynh https://launchpad.net/~vu-do-quynh"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
 msgstr ""
 
-#. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
 #, c-format
-msgid "%d dpi (draft)"
+msgid "%d dpi (default)"
 msgstr ""
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1292
 #, c-format
-msgid "%d dpi"
+msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
+msgid "%d dpi"
 msgstr ""
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
 msgstr "Thiếu các tệp"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
 msgstr "Vui lòng kiểm tra lại việc cài đặt"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
-msgstr "Tài liệu quét.pdf"
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr ""
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr ""
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr ""
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr ""
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr ""
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr ""
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr ""
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr ""
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "Cách dùng:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "Lựa chọn GTK+ :\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 11207a8..1c3aa15 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,551 +7,580 @@ msgid ""
 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-22 03:32+0000\n"
-"Last-Translator: Xhacker Liu <liu.dongyuan@gmail.com>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-09-20 08:05+0000\n"
+"Last-Translator: Dennis Kuang <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@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-10-22 04:48+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "扫描易"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr "A_4"
+msgid "_Document"
+msgstr "文档(_D)"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr "扫描(_A)"
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "单页(_P)"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:10
 msgid "All Pages From _Feeder"
 msgstr "传送来的所有页面(_F)"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr "背面"
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
-msgstr "剪裁"
+msgid "_Stop Scan"
+msgstr "停止扫描(_S)"
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr "裁剪选中的页面"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr "正面"
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr "正面和背面"
-
-#. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr "法定(_G)"
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr "新建"
-
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr "页面大小："
+msgid "Text"
+msgstr "文本"
 
 #. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
+#: ../data/simple-scan.ui.h:16
 msgid "Photo"
 msgstr "照片"
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr "首选项"
-
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
-msgstr "向左旋转"
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr "电子邮件(_E)"
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr "向右旋转"
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr "页面(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
+#: ../data/simple-scan.ui.h:22
 msgid "Rotate _Left"
 msgstr "向左旋转(_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
+#: ../data/simple-scan.ui.h:24
 msgid "Rotate _Right"
 msgstr "向右旋转(_R)"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "左旋页面 (逆时针)"
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "剪裁(_C)"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr "右旋页面 (顺时针)"
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "无(_N)"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
 
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "信件(_L)"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "法定(_G)"
+
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr "保存"
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr "将文档保存为文件"
+msgid "_Custom"
+msgstr "自定义(_C)"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr "扫描(_A)"
+msgid "_Rotate Crop"
+msgstr "旋转剪裁(_R)"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
-msgstr "扫描"
+msgid "Move Left"
+msgstr "左移"
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr "扫描来源(_O)："
+msgid "Move Right"
+msgstr "右移"
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr "扫描页面："
+msgid "_Help"
+msgstr "帮助(_H)"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
-msgstr "从扫描仪扫描一个单页"
-
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr "扫描易"
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr "单页(_P)"
+msgid "_Contents"
+msgstr "内容(_C)"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
 msgstr "开始一个新的文档"
 
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "新建"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "从扫描仪扫描一个单页"
+
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
-msgstr "停止"
+msgid "Scan"
+msgstr "扫描"
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr "将文档保存为文件"
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "保存"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
 msgid "Stop the current scan"
 msgstr "停止当前扫描"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr "文本"
-
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr "认证(_A)"
+msgid "Stop"
+msgstr "停止"
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
-msgstr "内容(_C)"
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "左旋页面 (逆时针)"
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr "剪裁(_C)"
+msgid "Rotate Left"
+msgstr "逆时针旋转"
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr "自定义(_C)"
+msgid "Rotate the page to the right (clockwise)"
+msgstr "右旋页面 (顺时针)"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr "文档(_D)"
+msgid "Rotate Right"
+msgstr "顺时针旋转"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "裁剪选中的页面"
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
-msgstr "电子邮件(_E)"
+msgid "Crop"
+msgstr "剪裁"
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr "帮助(_H)"
+msgid "_Username for resource:"
+msgstr "资源用户名(_U)："
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr "信件(_L)"
+msgid "_Password:"
+msgstr "密码(_P)："
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr "无(_N)"
+msgid "_Authorize"
+msgstr "认证(_A)"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr "页面(_P)"
+msgid "Preferences"
+msgstr "首选项"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr "密码(_P)："
+msgid "Scan S_ource:"
+msgstr "扫描来源(_O)："
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
-msgstr "图像分辨率(_P)："
+msgid "_Text Resolution:"
+msgstr "文字分辨率(_T)："
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr "旋转剪裁(_R)"
+msgid "_Photo Resolution:"
+msgstr "图像分辨率(_P)："
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
-msgstr "停止扫描(_S)"
+msgid "Scan Side:"
+msgstr "扫描页面："
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
-msgstr "文字分辨率(_T)："
+msgid "Page Size:"
+msgstr "页面大小："
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
-msgstr "资源用户名(_U)："
+msgid "Brightness:"
+msgstr "亮度："
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
-msgstr "扫描文档"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr "对比度："
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
-msgstr "扫描设备"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr "质量："
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
-msgstr "扫描方向"
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "正面和背面"
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
-msgstr "保存文件的文件夹："
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "正面"
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
-msgstr "纸张的高度 (以 0.1mm 计)"
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "背面"
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr "所扫描图像的的高度 (以像素计)"
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "扫描文档"
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
-msgstr "扫描纸张的哪面"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "窗口宽度 (像素)"
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
-msgstr "照片扫描分辨率"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "窗口高度 (像素)"
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
-msgstr "文本扫描分辨率"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "TRUE 如果应用程序窗口是最大化的"
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
-msgstr "上次扫描的图片分辨率"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "扫描设备"
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
 msgstr "从 SANE 设备获取图像。"
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
-msgstr "TRUE 如果应用程序窗口是最大化的"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "扫描文档的类型"
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
-msgstr "扫描仪扫描页面的方式。可以是如下几种：顶部到底部、底部到顶部、左边到右边，右边到左边"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr "要扫描的文件类型。此设置将决定扫描的分辨率、色彩和预处理。"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "扫描方向"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "扫描仪相对于被扫描页面的方向。"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "所扫描图像的宽度 (以像素计)。"
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr "用于保存文件的文件夹。如果不设置，默认使用 文档 文件夹。"
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
+msgstr "所扫描图像的宽度 (以像素计)。这是上次扫描的页面的值。"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "所扫描图像的的高度 (以像素计)"
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 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
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "纸张的宽度 (以 0.1mm 计)"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr "纸张的宽度 (以 0.1mm 计，0 代表自动检查纸张)"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "纸张的高度 (以 0.1mm 计)"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr "纸张的高度 (以 0.1mm 计，0 代表自动检查纸张)"
 
-#: ../data/simple-scan.schemas.in.h:16
-msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
-msgstr "扫描纸张的哪面。可以是以下值：“正面” “背面” “均扫描”"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr "扫描亮度"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr "扫描对比度"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr ""
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "上次扫描的图片分辨率"
 
-#: ../data/simple-scan.schemas.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
 msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr "上次扫描图片的分辨率 (点/英寸)。"
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "扫描照片时使用的分辨率 (点/英寸)。"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "文本扫描分辨率"
 
-#: ../data/simple-scan.schemas.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "上次扫描文档的分辨率 (点/英寸)。"
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr "所扫描图像的宽度 (以像素计)。这是上次扫描的页面的值。"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "照片扫描分辨率"
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr "纸张的宽度 (以 0.1mm 计，0 代表自动检查纸张)"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "扫描照片时使用的分辨率 (点/英寸)。"
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
-msgstr "扫描文档的类型"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "扫描纸张的哪面"
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
-msgstr "扫描文档的类型。“文本”适用于文本文档，“照片”适用于照片。这些设置将会决定扫描分辨率、色彩和预处理。"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "要扫描的页面。"
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
-msgstr "纸张的宽度 (以 0.1mm 计)"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "保存文件的文件夹："
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
-msgstr "所扫描图像的宽度 (以像素计)。"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr "用于保存文件的文件夹。如果不设置，默认使用 文档 文件夹。"
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
-msgstr "窗口高度 (像素)"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr "JPEG 压缩质量"
 
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
-msgstr "窗口宽度 (像素)"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr "JPEG 压缩质量"
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
 msgstr "没有可用的扫描仪。请连接一个扫描仪。"
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
 msgstr "无法连接到扫描仪"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
 msgstr "无法开始扫描"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
 msgstr "与扫描仪通信错误"
 
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "显示版本信息"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "显示调试信息"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr "修复旧版扫描易生成的 PDF 文件"
+
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
 msgstr "扫描失败"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
 msgstr "扫描的文档"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
-msgstr ""
-"用法：\n"
-"  %s [设备...] - 扫描工具"
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[设备...] - 扫描工具"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
-msgstr ""
-"帮助选项：\n"
-"  -d, --debug 输出调试信息\n"
-"  -v, --version 显示版本信息\n"
-"  -h, --help 显示帮助选项\n"
-"  --help-all 显示所有帮助选项\n"
-"  --help-gtk 显示 GTK+ 选项"
-
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
-#, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
-msgstr ""
-"GTK+ 选项：\n"
-"  --class=CLASS  窗口管理器所用的程序类\n"
-"  --name=NAME   窗口管理器所用的程序名\n"
-"  --screen=SCREEN  要使用的 X 屏幕\n"
-"  --sync  同步 X 调用\n"
-"  --gtk-module=MODULES  加载额外的 GTK+ 模块\n"
-"  --g-fatal-warnings  将所有警告置为致命"
+msgid "Run '%s --help' to see a full list of available command line options."
+msgstr "运行“%s --help”来查看可用命令行选项的完整列表。"
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "扫描的文件.pdf"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "使用“%s”需要用户名和密码"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
 msgstr "没有发现扫描仪"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
 msgstr "请检查您的扫描仪已经连接并且打开"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr "PDF (多页文档)"
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr "JPEG (压缩)"
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr "PNG (无损)"
-
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
 msgstr "保存为..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
 msgstr "图像文件"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
 msgstr "所有文件"
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
 msgstr "选择文件类型(_T)"
 
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF (多页文档)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (压缩)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (无损)"
+
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
 msgstr "保存文件错误"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
 msgstr "如果您不保存，变更将永久丢失。"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
 msgstr "保存当前文档？"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
 msgstr "放弃更改"
 
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "无法保存用以预览的图像"
+
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
 msgstr "无法打开图像预览软件"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
 msgstr "无法打开帮助文件"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -577,81 +606,182 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
 msgstr "关于扫描易"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
 msgstr "简易的文件扫描工具"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Alexey Kotlyarov https://launchpad.net/~koterpillar\n"
 "  Aron Xu https://launchpad.net/~happyaron\n"
+"  David Gao https://launchpad.net/~davidgao1001\n"
+"  Dennis Kuang https://launchpad.net/~denniskrq\n"
+"  Dingyuan Wang https://launchpad.net/~abcdoyle888\n"
 "  Heling Yao https://launchpad.net/~hyao\n"
 "  Jimhu https://launchpad.net/~huyiwei\n"
+"  Wang Dianjin https://launchpad.net/~tuhaihe\n"
+"  Wylmer Wang https://launchpad.net/~wantinghard\n"
 "  Xhacker Liu https://launchpad.net/~xhacker\n"
+"  YunJian https://launchpad.net/~tld5yj\n"
 "  YunQiang Su https://launchpad.net/~wzssyqa\n"
-"  ZhangCheng https://launchpad.net/~xxzc"
+"  ZhangCheng https://launchpad.net/~xxzc\n"
+"  zixue.liu https://launchpad.net/~zixue"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
 msgstr "退出前保存文档？"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
 msgstr "退出且不保存"
 
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (默认)"
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#: ../src/ui.vala:1292
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (草稿)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
-#, c-format
-msgid "%d dpi"
-msgstr "%d dpi"
-
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (高分辨率)"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
-msgstr "%d dpi (默认)"
+msgid "%d dpi"
+msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
 msgstr "文件丢失"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
 msgstr "请检查您的安装"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
 msgstr "更换扫描仪(_S)"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
 msgstr "自动"
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
-msgstr "扫描的文件.pdf"
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr ""
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr ""
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr ""
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr ""
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr "最小值"
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr "最大值"
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "正在保存文档..."
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "正在保存 %d/%d 页"
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "用法：\n"
+#~ "  %s [设备...] - 扫描工具"
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "GTK+ 选项：\n"
+#~ "  --class=CLASS  窗口管理器所用的程序类\n"
+#~ "  --name=NAME   窗口管理器所用的程序名\n"
+#~ "  --screen=SCREEN  要使用的 X 屏幕\n"
+#~ "  --sync  同步 X 调用\n"
+#~ "  --gtk-module=MODULES  加载额外的 GTK+ 模块\n"
+#~ "  --g-fatal-warnings  将所有警告置为致命"
+
+#~ msgid ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ msgstr "扫描仪扫描页面的方式。可以是如下几种：顶部到底部、底部到顶部、左边到右边，右边到左边"
+
+#~ msgid ""
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
+#~ msgstr "扫描文档的类型。“文本”适用于文本文档，“照片”适用于照片。这些设置将会决定扫描分辨率、色彩和预处理。"
+
+#, c-format
+#~ msgid ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+#~ msgstr ""
+#~ "帮助选项：\n"
+#~ "  -d, --debug 输出调试信息\n"
+#~ "  -v, --version 显示版本信息\n"
+#~ "  -h, --help 显示帮助选项\n"
+#~ "  --help-all 显示所有帮助选项\n"
+#~ "  --help-gtk 显示 GTK+ 选项"
+
+#~ msgid ""
+#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ msgstr "扫描纸张的哪面。可以是以下值：“正面” “背面” “均扫描”"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 97366ff..e707b00 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,553 +7,580 @@ msgid ""
 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-08-17 05:15+0000\n"
-"Last-Translator: Cheng-Chia Tseng <Unknown>\n"
+"POT-Creation-Date: 2013-09-03 12:47+1200\n"
+"PO-Revision-Date: 2012-10-25 09:21+0000\n"
+"Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@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-10-22 04:48+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2013-09-13 05:46+0000\n"
+"X-Generator: Launchpad (build 16761)\n"
 
-#. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:2
-msgid "4&#xD7;6"
-msgstr "4&#xD7;6"
+#. Title of scan window
+#: ../data/simple-scan.ui.h:2 ../data/simple-scan.desktop.in.h:1
+msgid "Simple Scan"
+msgstr "掃描易"
 
-#. Radio button for cropping page to A4 size
+#. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:4
-msgid "A_4"
-msgstr "A_4"
+msgid "_Document"
+msgstr "文件(_D)"
 
-#. Radio button for cropping page to A5 size
+#. Scan menu item
 #: ../data/simple-scan.ui.h:6
-msgid "A_5"
-msgstr "A_5"
+msgid "Sc_an"
+msgstr "掃描(_A)"
 
-#. Radio button for cropping page to A6 size
+#. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:8
-msgid "A_6"
-msgstr "A_6"
+msgid "Single _Page"
+msgstr "單一頁面(_P)"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:10
 msgid "All Pages From _Feeder"
 msgstr "來自進紙匣的所有頁面(_F)"
 
-#. Combo box label for scanning the back side of a page
+#. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:12
-msgid "Back"
-msgstr "背面"
-
-#: ../data/simple-scan.ui.h:13
-msgid "Crop"
-msgstr "裁切"
+msgid "_Stop Scan"
+msgstr "停止掃描(_S)"
 
+#. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:14
-msgid "Crop the selected page"
-msgstr "裁切所選的頁面"
-
-#. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:16
-msgid "Front"
-msgstr "正面"
-
-#. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:18
-msgid "Front and Back"
-msgstr "正面與背面"
-
-#. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:20
-msgid "Le_gal"
-msgstr "美規法定尺寸(_G)"
-
-#: ../data/simple-scan.ui.h:21
-msgid "New"
-msgstr "新增"
-
-#. Label beside page size combo box
-#: ../data/simple-scan.ui.h:23
-msgid "Page Size:"
-msgstr "頁面大小："
+msgid "Text"
+msgstr "文字"
 
 #. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:25
+#: ../data/simple-scan.ui.h:16
 msgid "Photo"
 msgstr "相片"
 
-#. Title of preferences dialog
-#: ../data/simple-scan.ui.h:27
-msgid "Preferences"
-msgstr "偏好設定"
-
-#. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:29
-msgid "Rotate Left"
-msgstr "向左旋轉"
+#. Label on email menu item
+#: ../data/simple-scan.ui.h:18
+msgid "_Email"
+msgstr "電子郵件(_E)"
 
-#. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:31
-msgid "Rotate Right"
-msgstr "向右旋轉"
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:20
+msgid "_Page"
+msgstr "頁面(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:33
+#: ../data/simple-scan.ui.h:22
 msgid "Rotate _Left"
 msgstr "向左旋轉(_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:35
+#: ../data/simple-scan.ui.h:24
 msgid "Rotate _Right"
 msgstr "向右旋轉(_R)"
 
-#. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:37
-msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "將頁面向左旋轉 (逆時針方向)"
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:26
+msgid "_Crop"
+msgstr "裁切(_C)"
 
-#. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:39
-msgid "Rotate the page to the right (clockwise)"
-msgstr "將頁面向右旋轉 (順時針方向)"
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:28
+msgid "_None"
+msgstr "無(_N)"
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:30
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:32
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:34
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:36
+msgid "_Letter"
+msgstr "美規信紙 (_Letter)"
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:38
+msgid "Le_gal"
+msgstr "美規長信紙 (Le_gal)"
 
+#. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:40
-msgid "Save"
-msgstr "儲存"
+msgid "4&#xD7;6"
+msgstr "4&#xD7;6"
 
-#. Tooltip for save toolbar button
+#. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:42
-msgid "Save document to a file"
-msgstr "將文件儲存至檔案"
+msgid "_Custom"
+msgstr "自訂(_C)"
 
-#. Scan menu item
+#. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:44
-msgid "Sc_an"
-msgstr "掃描(_A)"
+msgid "_Rotate Crop"
+msgstr "旋轉裁切區域(_R)"
 
-#. Label on scan toolbar item
+#. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:46
-msgid "Scan"
-msgstr "掃描"
+msgid "Move Left"
+msgstr "左移"
 
-#. Label beside scan source combo box
+#. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:48
-msgid "Scan S_ource:"
-msgstr "掃描來源(_O)："
+msgid "Move Right"
+msgstr "右移"
 
-#. Label beside scan side combo box
+#. Label on help menu
 #: ../data/simple-scan.ui.h:50
-msgid "Scan Side:"
-msgstr "掃描面："
+msgid "_Help"
+msgstr "幫助(_H)"
 
-#. Tooltip for scan toolbar button
+#. Help|Contents menu
 #: ../data/simple-scan.ui.h:52
-msgid "Scan a single page from the scanner"
-msgstr "從掃描器掃描單一頁面"
-
-#. Title of scan window
-#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
-msgid "Simple Scan"
-msgstr "簡易掃描"
-
-#. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:56
-msgid "Single _Page"
-msgstr "單一頁面(_P)"
+msgid "_Contents"
+msgstr "內容(_C)"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:54
 msgid "Start a new document"
 msgstr "起始一份新文件"
 
+#: ../data/simple-scan.ui.h:55
+msgid "New"
+msgstr "新增"
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:57
+msgid "Scan a single page from the scanner"
+msgstr "從掃描器掃描單一頁面"
+
+#. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:59
-msgid "Stop"
-msgstr "停止"
+msgid "Scan"
+msgstr "掃描"
 
-#. Tooltip for stop button
+#. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:61
+msgid "Save document to a file"
+msgstr "將文件儲存至檔案"
+
+#: ../data/simple-scan.ui.h:62
+msgid "Save"
+msgstr "儲存"
+
+#. Tooltip for stop button
+#: ../data/simple-scan.ui.h:64
 msgid "Stop the current scan"
 msgstr "停止目前的掃描"
 
-#. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:63
-msgid "Text"
-msgstr "文字"
-
-#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:65
-msgid "_Authorize"
-msgstr "授權(_A)"
+msgid "Stop"
+msgstr "停止"
 
-#. Help|Contents menu
+#. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:67
-msgid "_Contents"
-msgstr "內容(_C)"
+msgid "Rotate the page to the left (counter-clockwise)"
+msgstr "將頁面向左旋轉 (逆時針方向)"
 
-#. Label for page crop submenu
+#. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:69
-msgid "_Crop"
-msgstr "裁切(_C)"
+msgid "Rotate Left"
+msgstr "向左旋轉"
 
-#. Radio button for cropping to custom page size
+#. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:71
-msgid "_Custom"
-msgstr "自訂(_C)"
+msgid "Rotate the page to the right (clockwise)"
+msgstr "將頁面向右旋轉 (順時針方向)"
 
-#. Label on document menu (contains actions for this document, e.g. save, print)
+#. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:73
-msgid "_Document"
-msgstr "文件(_D)"
+msgid "Rotate Right"
+msgstr "向右旋轉"
+
+#: ../data/simple-scan.ui.h:74
+msgid "Crop the selected page"
+msgstr "裁切所選的頁面"
 
-#. Label on email menu item
 #: ../data/simple-scan.ui.h:75
-msgid "_Email"
-msgstr "電子郵件(_E)"
+msgid "Crop"
+msgstr "裁切"
 
-#. Label on help menu
+#. Label beside username entry
 #: ../data/simple-scan.ui.h:77
-msgid "_Help"
-msgstr "幫助(_H)"
+msgid "_Username for resource:"
+msgstr "資源的使用者名稱(_U)："
 
-#. Radio button for cropping page to US letter size
+#. Label beside password entry
 #: ../data/simple-scan.ui.h:79
-msgid "_Letter"
-msgstr "美規信紙(_L)"
+msgid "_Password:"
+msgstr "密碼(_P)："
 
-#. Radio button for no crop
+#. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:81
-msgid "_None"
-msgstr "無(_N)"
+msgid "_Authorize"
+msgstr "授權(_A)"
 
-#. Page menu (contains action for each page, e.g. delete, crop)
+#. Title of preferences dialog
 #: ../data/simple-scan.ui.h:83
-msgid "_Page"
-msgstr "頁面(_P)"
+msgid "Preferences"
+msgstr "偏好設定"
 
-#. Label beside password entry
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:85
-msgid "_Password:"
-msgstr "密碼(_P)："
+msgid "Scan S_ource:"
+msgstr "掃描來源(_O)："
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
-msgid "_Photo Resolution:"
-msgstr "相片解析度(_P)："
+msgid "_Text Resolution:"
+msgstr "文字解析度(_T)："
 
-#. Menu item to rotate the crop area
+#. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:89
-msgid "_Rotate Crop"
-msgstr "旋轉裁切區域(_R)"
+msgid "_Photo Resolution:"
+msgstr "相片解析度(_P)："
 
-#. Menu entry to stop current scan
+#. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:91
-msgid "_Stop Scan"
-msgstr "停止掃描(_S)"
+msgid "Scan Side:"
+msgstr "掃描面："
 
-#. Label beside scan source combo box
+#. Label beside page size combo box
 #: ../data/simple-scan.ui.h:93
-msgid "_Text Resolution:"
-msgstr "文字解析度(_T)："
+msgid "Page Size:"
+msgstr "頁面大小："
 
-#. Label beside username entry
+#. Label beside brightness scale
 #: ../data/simple-scan.ui.h:95
-msgid "_Username for resource:"
-msgstr "資源的使用者名稱(_U)："
+msgid "Brightness:"
+msgstr "亮度："
 
-#: ../data/simple-scan.desktop.in.h:1
-msgid "Scan Documents"
-msgstr "掃描文件"
+#. Label beside contrast scale
+#: ../data/simple-scan.ui.h:97
+msgid "Contrast:"
+msgstr "反差："
 
-#: ../data/simple-scan.schemas.in.h:1
-msgid "Device to scan from"
-msgstr "要從哪個裝置掃描"
+#. Label beside quality scale
+#: ../data/simple-scan.ui.h:99
+msgid "Quality:"
+msgstr "品質："
 
-#: ../data/simple-scan.schemas.in.h:2
-msgid "Direction of scan"
-msgstr "掃描的方向"
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:101
+msgid "Front and Back"
+msgstr "正面與背面"
 
-#: ../data/simple-scan.schemas.in.h:3
-msgid "Directory to save files to"
-msgstr "儲存檔案的目錄"
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:103
+msgid "Front"
+msgstr "正面"
 
-#: ../data/simple-scan.schemas.in.h:4
-msgid "Height of paper in tenths of a mm"
-msgstr "以 10 mm 為單位的紙張高度"
+#. Combo box label for scanning the back side of a page
+#: ../data/simple-scan.ui.h:105
+msgid "Back"
+msgstr "背面"
 
-#: ../data/simple-scan.schemas.in.h:5
-msgid "Height of scanned image in pixels"
-msgstr "掃描影像的高度，單位為像素"
+#: ../data/simple-scan.desktop.in.h:2
+msgid "Scan Documents"
+msgstr "掃描文件"
 
-#: ../data/simple-scan.schemas.in.h:6
-msgid "Page side to scan"
-msgstr "要掃描的頁面"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
+msgid "Window width in pixels"
+msgstr "視窗寬度，單位為像素"
 
-#: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution for photo scans"
-msgstr "相片掃描的解析度"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
+msgid "Window height in pixels"
+msgstr "視窗高度，單位為像素"
 
-#: ../data/simple-scan.schemas.in.h:8
-msgid "Resolution for text scans"
-msgstr "文字掃描的解析度"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
+msgid "TRUE if the application window is maximized"
+msgstr "如果應用程式視窗最大化時為 TRUE"
 
-#: ../data/simple-scan.schemas.in.h:9
-msgid "Resolution of last scanned image"
-msgstr "上次掃描影像的解析度"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
+msgid "Device to scan from"
+msgstr "要從哪個裝置掃描"
 
-#: ../data/simple-scan.schemas.in.h:10
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "SANE device to acquire images from."
 msgstr "取得影像用的 SANE 裝置。"
 
-#: ../data/simple-scan.schemas.in.h:11
-msgid "TRUE if the application window is maximized"
-msgstr "如果應用程式視窗最大化時為 TRUE"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
+msgid "Type of document being scanned"
+msgstr "掃描中文件的類型"
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid ""
-"The direction of the scanner across the scanned page. It can be one of the "
-"following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
-msgstr ""
-"掃描器橫越掃描頁面的方向。它可以是下列之一：「top-to-bottom」(頂端到底部)、「bottom-to-top」(底部到頂端)、「left-to-"
-"right」(左到右)、「right-to-left」(右到左)"
+"Type of document being scanned. This setting decides on the scan resolution, "
+"colors and post-processing."
+msgstr "掃描中文件的類型。這個設定值決定掃描的解析度、色彩、後製處理。"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
+msgid "Direction of scan"
+msgstr "掃描的方向"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
+msgid "The direction of the scanner across the scanned page."
+msgstr "掃描器跨越掃描頁面的方向。"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
+msgid "Width of scanned image in pixels"
+msgstr "掃描影像的寬度，單位為像素"
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr "儲存檔案到何目錄。如果沒有設定預的話，設值是「文件」目錄。"
+"The width of scanned image in pixels. This value is updated to what the last "
+"scanned page was."
+msgstr "掃描影像的寬度，單位為像素。此值會根據最近一次掃描頁面的情況更新。"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
+msgid "Height of scanned image in pixels"
+msgstr "掃描影像的高度，單位為像素"
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 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
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
+msgid "Width of paper in tenths of a mm"
+msgstr "以 0.1 mm 為單位的紙張寬度"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
-msgstr "以 10 mm 為單位的紙張高度 (或 0 以作為自動紙張偵測)。"
+msgstr "以 0.1 mm 為單位的紙張寬度 (或 0 以作為自動紙張偵測)。"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
+msgid "Height of paper in tenths of a mm"
+msgstr "以 0.1 mm 為單位的紙張高度"
 
-#: ../data/simple-scan.schemas.in.h:16
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid ""
-"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
-msgstr "要掃描的頁面。它可以是下列之一：「both」(兩者)、「front」(正面)、「back」(背面)"
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr "以 0.1 mm 為單位的紙張高度 (或 0 以作為自動紙張偵測)。"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
+msgid "Brightness of scan"
+msgstr "掃描亮度"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
+msgid "The brightness adjustment from -100 to 100 (0 being none)."
+msgstr "調整亮度，由 -100 至 100 (0 代表無)。"
 
-#: ../data/simple-scan.schemas.in.h:17
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
+msgid "Contrast of scan"
+msgstr "掃描反差"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
+msgid "The contrast adjustment from -100 to 100 (0 being none)."
+msgstr "調整反差，由 -100 至 100 (0 代表無)。"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
+msgid "Resolution of last scanned image"
+msgstr "上次掃描影像的解析度"
+
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:23
 msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr "之前掃描的影像其解析度，單位為 dpi。"
 
-#: ../data/simple-scan.schemas.in.h:18
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "當掃描相片時使用的解析度，單位為 dpi。"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:24
+msgid "Resolution for text scans"
+msgstr "文字掃描的解析度"
 
-#: ../data/simple-scan.schemas.in.h:19
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:25
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "當掃描文字時使用的解析度，單位為 dpi。"
 
-#: ../data/simple-scan.schemas.in.h:20
-msgid ""
-"The width of scanned image in pixels. This value is updated to what the last "
-"scanned page was."
-msgstr "掃描影像的寬度，單位為像素。此值會根據最近一次掃描頁面的情況更新。"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:26
+msgid "Resolution for photo scans"
+msgstr "相片掃描的解析度"
 
-#: ../data/simple-scan.schemas.in.h:21
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr "以 10 mm 為單位的紙張寬度 (或 0 以作為自動紙張偵測)。"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:27
+msgid "The resolution in dots-per-inch to use when scanning photos."
+msgstr "當掃描相片時使用的解析度，單位為 dpi。"
 
-#: ../data/simple-scan.schemas.in.h:22
-msgid "Type of document being scanned"
-msgstr "掃描中文件的類型"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:28
+msgid "Page side to scan"
+msgstr "要掃描的頁面"
 
-#: ../data/simple-scan.schemas.in.h:23
-msgid ""
-"Type of document being scanned. 'text' for text documents, 'photo' for "
-"photos. This setting decides on the scan resolution, colors and post-"
-"processing."
-msgstr "掃描中文件的類型。「文字」表示文字型文件，「相片」表示相片型文件。此設定值會決定掃描解析度、色彩，以及後製處理。"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:29
+msgid "The page side to scan."
+msgstr "要掃描的頁面。"
 
-#: ../data/simple-scan.schemas.in.h:24
-msgid "Width of paper in tenths of a mm"
-msgstr "以 10 mm 為單位的紙張寬度"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:30
+msgid "Directory to save files to"
+msgstr "儲存檔案的目錄"
 
-#: ../data/simple-scan.schemas.in.h:25
-msgid "Width of scanned image in pixels"
-msgstr "掃描影像的寬度，單位為像素"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:31
+msgid ""
+"The directory to save files to. Defaults to the documents directory if unset."
+msgstr "儲存檔案到何目錄。如果沒有預設值的話，設值會是「文件」目錄。"
 
-#: ../data/simple-scan.schemas.in.h:26
-msgid "Window height in pixels"
-msgstr "視窗高度，單位為像素"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:32
+msgid "Quality value to use for JPEG compression"
+msgstr "JPEG 壓縮品質"
 
-#: ../data/simple-scan.schemas.in.h:27
-msgid "Window width in pixels"
-msgstr "視窗寬度，單位為像素"
+#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:33
+msgid "Quality value to use for JPEG compression."
+msgstr "JPEG 壓縮品質。"
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:889
+#: ../src/scanner.vala:814
 msgid "No scanners available.  Please connect a scanner."
 msgstr "沒有可用的掃描器。請連接一部掃描器。"
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:916
+#: ../src/scanner.vala:844
 msgid "Unable to connect to scanner"
 msgstr "無法連接到掃描器"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1222
+#: ../src/scanner.vala:1207
 msgid "Unable to start scan"
 msgstr "無法起始掃描"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1346
+#: ../src/scanner.vala:1220 ../src/scanner.vala:1317
 msgid "Error communicating with scanner"
 msgstr "與掃描器溝通時發生錯誤"
 
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
+msgid "Show release version"
+msgstr "顯示發行版本"
+
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
+msgid "Print debugging messages"
+msgstr "列印除錯訊息"
+
+#: ../src/simple-scan.vala:26
+msgid "Fix PDF files generated with older versions of Simple Scan"
+msgstr "修正由舊版本「簡易掃描」產生的 PDF 檔案"
+
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:265
+#: ../src/simple-scan.vala:297
 msgid "Failed to scan"
 msgstr "掃描失敗"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:283
+#: ../src/simple-scan.vala:316
 msgid "Scanned Document"
 msgstr "掃描的文件"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:426
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s [DEVICE...] - Scanning utility"
-msgstr ""
-"用法：\n"
-"  %s [裝置...] - 掃瞄工具"
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:529
+msgid "[DEVICE...] - Scanning utility"
+msgstr "[裝置...] - 掃描公用程式"
 
-#. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:434
-#, c-format
-msgid ""
-"Help Options:\n"
-"  -d, --debug                     Print debugging messages\n"
-"  -v, --version                   Show release version\n"
-"  -h, --help                      Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
-msgstr ""
-"求助選項：\n"
-"  -d, --debug 顯示除蟲訊息\n"
-"  -v, --version 顯示發佈版本\n"
-"  -h, --help 顯示求助選項\n"
-"  --help-all 顯示所有求助選項\n"
-"  --help-gtk 顯示 GTK+ 選項"
-
-#. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:446
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:540
 #, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
-msgstr ""
-"GTK+ 選項：\n"
-"  --class=CLASS                   如同視窗管理程式使用的程式類別\n"
-"  --name=NAME                     如同視窗管理程式使用的程式名稱\n"
-"  --screen=SCREEN                 要使用的 X 螢幕\n"
-"  --sync                          讓 X 呼叫同步化\n"
-"  --gtk-module=MODULES            載入額外的 GTK+ 模組\n"
-"  --g-fatal-warnings              將所有警告設為嚴重的"
+msgid "Run '%s --help' to see a full list of available command line options."
+msgstr "執行「%s --help」來查看所有命令列可用選項的完整清單。"
+
+#: ../src/ui.vala:91
+msgid "Scanned Document.pdf"
+msgstr "掃描的文件.pdf"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:151
+#: ../src/ui.vala:159
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "要存取「%s」需要提供使用者名稱與密碼"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:200
+#: ../src/ui.vala:202
 msgid "No scanners detected"
 msgstr "沒有偵測到掃描器"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:202
+#: ../src/ui.vala:204
 msgid "Please check your scanner is connected and powered on"
 msgstr "請檢查您的掃描器是否連接，並且是否開啟電源"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:382
-msgid "PDF (multi-page document)"
-msgstr "PDF (多頁文件)"
-
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:384
-msgid "JPEG (compressed)"
-msgstr "JPEG (壓縮)"
-
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:386
-msgid "PNG (lossless)"
-msgstr "PNG (無損)"
-
 #. Save dialog: Dialog title
-#: ../src/ui.c:398
+#: ../src/ui.vala:363
 msgid "Save As..."
-msgstr "另存新檔..."
+msgstr "另存為..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:414
+#: ../src/ui.vala:377
 msgid "Image Files"
 msgstr "影像檔"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:421
+#: ../src/ui.vala:383
 msgid "All Files"
 msgstr "所有檔案"
 
 #. 
-#: ../src/ui.c:426
+#: ../src/ui.vala:388
 msgid "Select File _Type"
 msgstr "選取檔案類型(_T)"
 
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:402
+msgid "PDF (multi-page document)"
+msgstr "PDF (多頁文件)"
+
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:408
+msgid "JPEG (compressed)"
+msgstr "JPEG (壓縮)"
+
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:414
+msgid "PNG (lossless)"
+msgstr "PNG (無損)"
+
 #. Title of error dialog when save failed
-#: ../src/ui.c:524
+#: ../src/ui.vala:503
 msgid "Failed to save file"
 msgstr "儲存檔案失敗"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:552
+#: ../src/ui.vala:526
 msgid "If you don't save, changes will be permanently lost."
 msgstr "如果您不儲存，變更將會永久消失。"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:594
+#: ../src/ui.vala:563
 msgid "Save current document?"
-msgstr "儲存至目前文件？"
+msgstr "是否儲存目前文件？"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.c:596
+#: ../src/ui.vala:565
 msgid "Discard Changes"
 msgstr "放棄變更"
 
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:860
+msgid "Unable to save image for preview"
+msgstr "無法儲存影像以供預覽"
+
 #. Error message display when unable to preview image
-#: ../src/ui.c:950
+#: ../src/ui.vala:872
 msgid "Unable to open image preview application"
 msgstr "無法開啟影像預覽應用程式"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1246
+#: ../src/ui.vala:1119
 msgid "Unable to open help file"
 msgstr "無法開啟幫助文件檔案"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1261
+#: ../src/ui.vala:1130
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -576,75 +603,177 @@ msgstr ""
 "您應已收到附隨於本程式的 GNU 通用公眾授權的副本；如果沒有，請參照 <http://www.gnu.org/licenses/>。"
 
 #. Title of about dialog
-#: ../src/ui.c:1275
+#: ../src/ui.vala:1133
 msgid "About Simple Scan"
 msgstr "關於「簡易掃描」"
 
 #. Description of program
-#: ../src/ui.c:1278
+#: ../src/ui.vala:1136
 msgid "Simple document scanning tool"
 msgstr "簡易文件掃描工具"
 
-#: ../src/ui.c:1287
+#: ../src/ui.vala:1145
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Cheng-Chia Tseng https://launchpad.net/~zerng07"
+"  Cheng-Chia Tseng https://launchpad.net/~zerng07\n"
+"  Chien-Hao Wu https://launchpad.net/~pinychwu\n"
+"  Robert Ancell https://launchpad.net/~robert-ancell\n"
+"  Roy Chan https://launchpad.net/~roy-chan-linux\n"
+"  Walter Cheuk https://launchpad.net/~wwycheuk\n"
+"  Yu - Sian , Liu https://launchpad.net/~thomasysliu\n"
+"  nckuhuahua https://launchpad.net/~nckuhuahua"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1305
+#: ../src/ui.vala:1156
 msgid "Save document before quitting?"
-msgstr "在退出前要儲存文件嗎？"
+msgstr "在結束前要儲存文件嗎？"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1307
+#: ../src/ui.vala:1158
 msgid "Quit without Saving"
 msgstr "直接退出而不儲存"
 
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1289
+#, c-format
+msgid "%d dpi (default)"
+msgstr "%d dpi (預設)"
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1449
+#: ../src/ui.vala:1292
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (草稿)"
 
-#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
-#, c-format
-msgid "%d dpi"
-msgstr "%d dpi"
-
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1455
+#: ../src/ui.vala:1295
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (高解析度)"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1478
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1298
 #, c-format
-msgid "%d dpi (default)"
-msgstr "%d dpi (預設)"
+msgid "%d dpi"
+msgstr "%d dpi"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1523
+#: ../src/ui.vala:1333
 msgid "Files missing"
-msgstr "檔案遺失"
+msgstr "缺少檔案"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1525
+#: ../src/ui.vala:1335
 msgid "Please check your installation"
 msgstr "請檢查您的安裝是否完整"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1582
+#: ../src/ui.vala:1403
 msgid "Change _Scanner"
 msgstr "變更掃描器(_S)"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1588
+#: ../src/ui.vala:1409
 msgid "Automatic"
 msgstr "自動"
 
-#: ../src/ui.c:1866
-msgid "Scanned Document.pdf"
-msgstr "掃描的文件.pdf"
+#: ../src/ui.vala:1449
+#, c-format
+msgid "Darker"
+msgstr "較深"
+
+#: ../src/ui.vala:1451
+#, c-format
+msgid "Lighter"
+msgstr "較淺"
+
+#: ../src/ui.vala:1458
+#, c-format
+msgid "Less"
+msgstr "少"
+
+#: ../src/ui.vala:1460
+#, c-format
+msgid "More"
+msgstr "多"
+
+#: ../src/ui.vala:1467
+#, c-format
+msgid "Minimum"
+msgstr "最小"
+
+#: ../src/ui.vala:1469
+#, c-format
+msgid "Maximum"
+msgstr "最大"
+
+#: ../src/ui.vala:1527
+msgid "Saving document..."
+msgstr "正在儲存文件..."
+
+#: ../src/ui.vala:1545
+#, c-format
+msgid "Saving page %d out of %d"
+msgstr "正在儲存 %2$d 頁中的第 %1$d 頁"
+
+#~ msgid ""
+#~ "Type of document being scanned. 'text' for text documents, 'photo' for "
+#~ "photos. This setting decides on the scan resolution, colors and post-"
+#~ "processing."
+#~ msgstr "掃描中文件的類型。「文字」表示文字型文件，「相片」表示相片型文件。此設定值會決定掃描解析度、色彩，以及後製處理。"
+
+#, c-format
+#~ msgid ""
+#~ "Help Options:\n"
+#~ "  -d, --debug                     Print debugging messages\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, --help                      Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+#~ msgstr ""
+#~ "求助選項：\n"
+#~ "  -d, --debug 顯示除蟲訊息\n"
+#~ "  -v, --version 顯示發佈版本\n"
+#~ "  -h, --help 顯示求助選項\n"
+#~ "  --help-all 顯示所有求助選項\n"
+#~ "  --help-gtk 顯示 GTK+ 選項"
+
+#, c-format
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s [DEVICE...] - Scanning utility"
+#~ msgstr ""
+#~ "用法：\n"
+#~ "  %s [裝置...] - 掃瞄工具"
+
+#, c-format
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "GTK+ 選項：\n"
+#~ "  --class=CLASS                   如同視窗管理程式使用的程式類別\n"
+#~ "  --name=NAME                     如同視窗管理程式使用的程式名稱\n"
+#~ "  --screen=SCREEN                 要使用的 X 螢幕\n"
+#~ "  --sync                          讓 X 呼叫同步化\n"
+#~ "  --gtk-module=MODULES            載入額外的 GTK+ 模組\n"
+#~ "  --g-fatal-warnings              將所有警告設為嚴重的"
+
+#~ msgid ""
+#~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+#~ msgstr "要掃描的頁面。它可以是下列之一：「both」(兩者)、「front」(正面)、「back」(背面)"
+
+#~ msgid ""
+#~ "The direction of the scanner across the scanned page. It can be one of the "
+#~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
+#~ msgstr ""
+#~ "掃描器橫越掃描頁面的方向。它可以是下列之一：「top-to-bottom」(頂端到底部)、「bottom-to-top」(底部到頂端)、「left-to-"
+#~ "right」(左到右)、「right-to-left」(右到左)"
diff --git a/src/Makefile.am b/src/Makefile.am
index 3fa8558..6d0f493 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,29 +1,37 @@
 bin_PROGRAMS = simple-scan
 
+resources.c: $(top_srcdir)/data/simple-scan.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir=$(top_srcdir)/data/ $(top_srcdir)/data/simple-scan.gresource.xml)
+	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(top_srcdir)/data/ --generate-source $<
+
 simple_scan_SOURCES = \
 	config.vapi \
 	book.vala \
 	book-view.vala \
 	colord.vapi \
-	jpeglib.vapi \
 	page.vala \
 	page-view.vala \
 	sane.vapi \
 	simple-scan.vala \
 	scanner.vala \
-	ui.vala
+	ui.vala \
+	autosave-manager.vala \
+	resources.c
 
 simple_scan_VALAFLAGS = \
 	--pkg=zlib \
 	--pkg=gudev-1.0 \
 	--pkg=gio-2.0 \
-	--pkg=gtk+-3.0
+	--pkg=gtk+-3.0 \
+	--pkg=sqlite3 \
+	--debug \
+	--target-glib 2.32
 
 if HAVE_COLORD
 simple_scan_VALAFLAGS += -D HAVE_COLORD
 endif
 
 simple_scan_CFLAGS = \
+	-w \
 	$(SIMPLE_SCAN_CFLAGS) \
 	$(COLORD_CFLAGS) \
 	$(WARN_CFLAGS) \
@@ -39,11 +47,11 @@ simple_scan_LDADD = \
 	$(SIMPLE_SCAN_LIBS) \
 	$(COLORD_LIBS) \
 	-lsane \
-	-ljpeg \
 	-lm
 
 CLEANFILES = \
 	$(patsubst %.vala,%.c,$(filter %.vala, $(SOURCES))) \
+	resources.c \
 	*_vala.stamp
 
 DISTCLEANFILES = \
diff --git a/src/Makefile.in b/src/Makefile.in
index 2ec6077..0a6031b 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,15 +79,15 @@ POST_UNINSTALL = :
 bin_PROGRAMS = simple-scan$(EXEEXT)
 @HAVE_COLORD_TRUE@am__append_1 = -D HAVE_COLORD
 subdir = src
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in book-view.c \
-	book.c page-view.c page.c scanner.c simple-scan.c \
-	simple_scan_vala.stamp ui.c
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am book.c \
+	book-view.c page.c page-view.c simple-scan.c scanner.c ui.c \
+	autosave-manager.c $(top_srcdir)/depcomp \
+	$(srcdir)/simple_scan_vala.stamp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)"
@@ -69,39 +96,51 @@ am_simple_scan_OBJECTS = simple_scan-book.$(OBJEXT) \
 	simple_scan-book-view.$(OBJEXT) simple_scan-page.$(OBJEXT) \
 	simple_scan-page-view.$(OBJEXT) \
 	simple_scan-simple-scan.$(OBJEXT) \
-	simple_scan-scanner.$(OBJEXT) simple_scan-ui.$(OBJEXT)
+	simple_scan-scanner.$(OBJEXT) simple_scan-ui.$(OBJEXT) \
+	simple_scan-autosave-manager.$(OBJEXT) \
+	simple_scan-resources.$(OBJEXT)
 simple_scan_OBJECTS = $(am_simple_scan_OBJECTS)
 am__DEPENDENCIES_1 =
 simple_scan_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 simple_scan_LINK = $(CCLD) $(simple_scan_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 VALACOMPILE = $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS)
 AM_V_VALAC = $(am__v_VALAC_@AM_V@)
 am__v_VALAC_ = $(am__v_VALAC_@AM_DEFAULT_V@)
-am__v_VALAC_0 = @echo "  VALAC " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_VALAC_0 = @echo "  VALAC   " $@;
+am__v_VALAC_1 = 
 SOURCES = $(simple_scan_SOURCES)
 DIST_SOURCES = $(simple_scan_SOURCES)
 am__can_run_installinfo = \
@@ -109,6 +148,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -138,6 +194,7 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
@@ -239,17 +296,20 @@ simple_scan_SOURCES = \
 	book.vala \
 	book-view.vala \
 	colord.vapi \
-	jpeglib.vapi \
 	page.vala \
 	page-view.vala \
 	sane.vapi \
 	simple-scan.vala \
 	scanner.vala \
-	ui.vala
+	ui.vala \
+	autosave-manager.vala \
+	resources.c
 
 simple_scan_VALAFLAGS = --pkg=zlib --pkg=gudev-1.0 --pkg=gio-2.0 \
-	--pkg=gtk+-3.0 $(am__append_1)
+	--pkg=gtk+-3.0 --pkg=sqlite3 --debug --target-glib 2.32 \
+	$(am__append_1)
 simple_scan_CFLAGS = \
+	-w \
 	$(SIMPLE_SCAN_CFLAGS) \
 	$(COLORD_CFLAGS) \
 	$(WARN_CFLAGS) \
@@ -265,11 +325,11 @@ simple_scan_LDADD = \
 	$(SIMPLE_SCAN_LIBS) \
 	$(COLORD_LIBS) \
 	-lsane \
-	-ljpeg \
 	-lm
 
 CLEANFILES = \
 	$(patsubst %.vala,%.c,$(filter %.vala, $(SOURCES))) \
+	resources.c \
 	*_vala.stamp
 
 DISTCLEANFILES = \
@@ -288,9 +348,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu src/Makefile
+	  $(AUTOMAKE) --foreign src/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -318,10 +378,11 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -342,13 +403,15 @@ uninstall-binPROGRAMS:
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
 
 clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+
 simple-scan$(EXEEXT): $(simple_scan_OBJECTS) $(simple_scan_DEPENDENCIES) $(EXTRA_simple_scan_DEPENDENCIES) 
 	@rm -f simple-scan$(EXEEXT)
 	$(AM_V_CCLD)$(simple_scan_LINK) $(simple_scan_OBJECTS) $(simple_scan_LDADD) $(LIBS)
@@ -359,10 +422,12 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simple_scan-autosave-manager.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simple_scan-book-view.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simple_scan-book.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simple_scan-page-view.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simple_scan-page.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simple_scan-resources.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simple_scan-scanner.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simple_scan-simple-scan.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simple_scan-ui.Po@am__quote@
@@ -478,6 +543,34 @@ simple_scan-ui.obj: ui.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ui.c' object='simple_scan-ui.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -c -o simple_scan-ui.obj `if test -f 'ui.c'; then $(CYGPATH_W) 'ui.c'; else $(CYGPATH_W) '$(srcdir)/ui.c'; fi`
+
+simple_scan-autosave-manager.o: autosave-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -MT simple_scan-autosave-manager.o -MD -MP -MF $(DEPDIR)/simple_scan-autosave-manager.Tpo -c -o simple_scan-autosave-manager.o `test -f 'autosave-manager.c' || echo '$(srcdir)/'`autosave-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/simple_scan-autosave-manager.Tpo $(DEPDIR)/simple_scan-autosave-manager.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='autosave-manager.c' object='simple_scan-autosave-manager.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -c -o simple_scan-autosave-manager.o `test -f 'autosave-manager.c' || echo '$(srcdir)/'`autosave-manager.c
+
+simple_scan-autosave-manager.obj: autosave-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -MT simple_scan-autosave-manager.obj -MD -MP -MF $(DEPDIR)/simple_scan-autosave-manager.Tpo -c -o simple_scan-autosave-manager.obj `if test -f 'autosave-manager.c'; then $(CYGPATH_W) 'autosave-manager.c'; else $(CYGPATH_W) '$(srcdir)/autosave-manager.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/simple_scan-autosave-manager.Tpo $(DEPDIR)/simple_scan-autosave-manager.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='autosave-manager.c' object='simple_scan-autosave-manager.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -c -o simple_scan-autosave-manager.obj `if test -f 'autosave-manager.c'; then $(CYGPATH_W) 'autosave-manager.c'; else $(CYGPATH_W) '$(srcdir)/autosave-manager.c'; fi`
+
+simple_scan-resources.o: resources.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -MT simple_scan-resources.o -MD -MP -MF $(DEPDIR)/simple_scan-resources.Tpo -c -o simple_scan-resources.o `test -f 'resources.c' || echo '$(srcdir)/'`resources.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/simple_scan-resources.Tpo $(DEPDIR)/simple_scan-resources.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='resources.c' object='simple_scan-resources.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -c -o simple_scan-resources.o `test -f 'resources.c' || echo '$(srcdir)/'`resources.c
+
+simple_scan-resources.obj: resources.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -MT simple_scan-resources.obj -MD -MP -MF $(DEPDIR)/simple_scan-resources.Tpo -c -o simple_scan-resources.obj `if test -f 'resources.c'; then $(CYGPATH_W) 'resources.c'; else $(CYGPATH_W) '$(srcdir)/resources.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/simple_scan-resources.Tpo $(DEPDIR)/simple_scan-resources.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='resources.c' object='simple_scan-resources.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(simple_scan_CFLAGS) $(CFLAGS) -c -o simple_scan-resources.obj `if test -f 'resources.c'; then $(CYGPATH_W) 'resources.c'; else $(CYGPATH_W) '$(srcdir)/resources.c'; fi`
 $(srcdir)/book.c: $(srcdir)/simple_scan_vala.stamp
 	@if test -f $@; then :; else rm -f $(srcdir)/simple_scan_vala.stamp; fi
 	@if test -f $@; then :; else \
@@ -513,31 +606,25 @@ $(srcdir)/ui.c: $(srcdir)/simple_scan_vala.stamp
 	@if test -f $@; then :; else \
 	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/simple_scan_vala.stamp; \
 	fi
-$(srcdir)/simple_scan_vala.stamp: config.vapi book.vala book-view.vala colord.vapi jpeglib.vapi page.vala page-view.vala sane.vapi simple-scan.vala scanner.vala ui.vala
+$(srcdir)/autosave-manager.c: $(srcdir)/simple_scan_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/simple_scan_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/simple_scan_vala.stamp; \
+	fi
+$(srcdir)/simple_scan_vala.stamp: config.vapi book.vala book-view.vala colord.vapi page.vala page-view.vala sane.vapi simple-scan.vala scanner.vala ui.vala autosave-manager.vala
 	$(AM_V_at)rm -f $@ && echo stamp > $@-t
-	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(simple_scan_VALAFLAGS) $(VALAFLAGS) -C config.vapi book.vala book-view.vala colord.vapi jpeglib.vapi page.vala page-view.vala sane.vapi simple-scan.vala scanner.vala ui.vala
+	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(simple_scan_VALAFLAGS) $(VALAFLAGS) -C config.vapi book.vala book-view.vala colord.vapi page.vala page-view.vala sane.vapi simple-scan.vala scanner.vala ui.vala autosave-manager.vala
 	$(AM_V_at)mv -f $@-t $@
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -549,15 +636,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -566,6 +649,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -639,13 +737,22 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+	-rm -f $(srcdir)/autosave-manager.c
+	-rm -f $(srcdir)/book-view.c
+	-rm -f $(srcdir)/book.c
+	-rm -f $(srcdir)/page-view.c
+	-rm -f $(srcdir)/page.c
+	-rm -f $(srcdir)/scanner.c
+	-rm -f $(srcdir)/simple-scan.c
+	-rm -f $(srcdir)/simple_scan_vala.stamp
+	-rm -f $(srcdir)/ui.c
+	-rm -f autosave-manager.c
 	-rm -f book-view.c
 	-rm -f book.c
 	-rm -f page-view.c
 	-rm -f page.c
 	-rm -f scanner.c
 	-rm -f simple-scan.c
-	-rm -f simple_scan_vala.stamp
 	-rm -f ui.c
 clean: clean-am
 
@@ -718,19 +825,23 @@ uninstall-am: uninstall-binPROGRAMS
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic ctags distclean distclean-compile \
-	distclean-generic distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-binPROGRAMS
-
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+	clean-binPROGRAMS clean-generic cscopelist-am ctags ctags-am \
+	distclean distclean-compile distclean-generic distclean-tags \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-binPROGRAMS install-data install-data-am \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
+	ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-binPROGRAMS
+
+
+resources.c: $(top_srcdir)/data/simple-scan.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir=$(top_srcdir)/data/ $(top_srcdir)/data/simple-scan.gresource.xml)
+	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(top_srcdir)/data/ --generate-source $<
 
 # 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.
diff --git a/src/autosave-manager.c b/src/autosave-manager.c
new file mode 100644
index 0000000..a97cb6c
--- /dev/null
+++ b/src/autosave-manager.c
@@ -0,0 +1,3481 @@
+/* autosave-manager.c generated by valac 0.20.1, the Vala compiler
+ * generated from autosave-manager.vala, do not modify */
+
+/*
+ * Copyright (C) 2011 Timo Kluck
+ * Author: Timo Kluck <tkluck@infty.nl>
+ *
+ * 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 3 of the License, or (at your option) any later
+ * version. See http://www.gnu.org/copyleft/gpl.html the full text of the
+ * license.
+ */
+/*
+ * We store autosaves in a database named
+ *    ~/.cache/simple-scan/autosaves/autosaves.db
+ * It contains a single table of pages, each containing the process id (pid) of
+ * the simple-scan instance that saved it, and a hash of the Book and Page
+ * objects corresponding to it. The pixels are saved as a BLOB.
+ * Additionally, the autosaves directory contains a number of tiff files that
+ * the user can use for manual recovery.
+ *
+ * At startup, we check whether autosaves.db contains any records
+ * with a pid that does not match a current pid for simple-scan. If so, we take
+ * ownership by an UPDATE statement changing to our own pid. Then, we
+ * recover the book. We're trying our best to avoid the possible race
+ * condition if several instances of simple-scan are started simultaneously.
+ *
+ * At application exit, we delete the records corresponding to our own pid.
+ *
+ * Important notes:
+ *  - We enforce that there is only one AutosaveManager instance in a given
+ *    process by using a create function.
+ *  - It should be possible to change the book object at runtime, although this
+ *    is not used in the current implementation so it has not been tested.
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+#include <sqlite3.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <gio/gio.h>
+#include <float.h>
+#include <math.h>
+#include <gobject/gvaluecollector.h>
+
+
+#define TYPE_AUTOSAVE_MANAGER (autosave_manager_get_type ())
+#define AUTOSAVE_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_AUTOSAVE_MANAGER, AutosaveManager))
+#define AUTOSAVE_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_AUTOSAVE_MANAGER, AutosaveManagerClass))
+#define IS_AUTOSAVE_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_AUTOSAVE_MANAGER))
+#define IS_AUTOSAVE_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_AUTOSAVE_MANAGER))
+#define AUTOSAVE_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_AUTOSAVE_MANAGER, AutosaveManagerClass))
+
+typedef struct _AutosaveManager AutosaveManager;
+typedef struct _AutosaveManagerClass AutosaveManagerClass;
+typedef struct _AutosaveManagerPrivate AutosaveManagerPrivate;
+
+#define TYPE_BOOK (book_get_type ())
+#define BOOK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_BOOK, Book))
+#define BOOK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_BOOK, BookClass))
+#define IS_BOOK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_BOOK))
+#define IS_BOOK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_BOOK))
+#define BOOK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_BOOK, BookClass))
+
+typedef struct _Book Book;
+typedef struct _BookClass BookClass;
+
+#define TYPE_PAGE (page_get_type ())
+#define PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PAGE, Page))
+#define PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PAGE, PageClass))
+#define IS_PAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PAGE))
+#define IS_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PAGE))
+#define PAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PAGE, PageClass))
+
+typedef struct _Page Page;
+typedef struct _PageClass PageClass;
+#define _sqlite3_close0(var) ((var == NULL) ? NULL : (var = (sqlite3_close (var), NULL)))
+#define _book_unref0(var) ((var == NULL) ? NULL : (var = (book_unref (var), NULL)))
+#define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL)))
+#define _autosave_manager_unref0(var) ((var == NULL) ? NULL : (var = (autosave_manager_unref (var), NULL)))
+#define _g_free0(var) (var = (g_free (var), NULL))
+#define _sqlite3_finalize0(var) ((var == NULL) ? NULL : (var = (sqlite3_finalize (var), NULL)))
+#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
+#define _page_unref0(var) ((var == NULL) ? NULL : (var = (page_unref (var), NULL)))
+#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+
+#define TYPE_SCAN_DIRECTION (scan_direction_get_type ())
+
+#define TYPE_SCAN_PAGE_INFO (scan_page_info_get_type ())
+#define SCAN_PAGE_INFO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SCAN_PAGE_INFO, ScanPageInfo))
+#define SCAN_PAGE_INFO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SCAN_PAGE_INFO, ScanPageInfoClass))
+#define IS_SCAN_PAGE_INFO(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SCAN_PAGE_INFO))
+#define IS_SCAN_PAGE_INFO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SCAN_PAGE_INFO))
+#define SCAN_PAGE_INFO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SCAN_PAGE_INFO, ScanPageInfoClass))
+
+typedef struct _ScanPageInfo ScanPageInfo;
+typedef struct _ScanPageInfoClass ScanPageInfoClass;
+typedef struct _ScanPageInfoPrivate ScanPageInfoPrivate;
+#define _scan_page_info_unref0(var) ((var == NULL) ? NULL : (var = (scan_page_info_unref (var), NULL)))
+typedef struct _ParamSpecAutosaveManager ParamSpecAutosaveManager;
+
+struct _AutosaveManager {
+	GTypeInstance parent_instance;
+	volatile int ref_count;
+	AutosaveManagerPrivate * priv;
+};
+
+struct _AutosaveManagerClass {
+	GTypeClass parent_class;
+	void (*finalize) (AutosaveManager *self);
+};
+
+struct _AutosaveManagerPrivate {
+	sqlite3* database_connection;
+	Book* _book;
+	guint update_timeout;
+	GHashTable* dirty_pages;
+	gint cur_book_revision;
+};
+
+typedef enum  {
+	SCAN_DIRECTION_TOP_TO_BOTTOM,
+	SCAN_DIRECTION_LEFT_TO_RIGHT,
+	SCAN_DIRECTION_BOTTOM_TO_TOP,
+	SCAN_DIRECTION_RIGHT_TO_LEFT
+} ScanDirection;
+
+struct _ScanPageInfo {
+	GTypeInstance parent_instance;
+	volatile int ref_count;
+	ScanPageInfoPrivate * priv;
+	gint width;
+	gint height;
+	gint depth;
+	gint n_channels;
+	gdouble dpi;
+	gchar* device;
+};
+
+struct _ScanPageInfoClass {
+	GTypeClass parent_class;
+	void (*finalize) (ScanPageInfo *self);
+};
+
+struct _ParamSpecAutosaveManager {
+	GParamSpec parent_instance;
+};
+
+
+static gpointer autosave_manager_parent_class = NULL;
+static gchar* autosave_manager_AUTOSAVE_DIR;
+static gchar* autosave_manager_AUTOSAVE_DIR = NULL;
+static gchar* autosave_manager_AUTOSAVE_NAME;
+static gchar* autosave_manager_AUTOSAVE_NAME = NULL;
+static gchar* autosave_manager_AUTOSAVE_EXT;
+static gchar* autosave_manager_AUTOSAVE_EXT = NULL;
+static gchar* autosave_manager_AUTOSAVE_FILENAME;
+static gchar* autosave_manager_AUTOSAVE_FILENAME = NULL;
+static gchar* autosave_manager_PID;
+static gchar* autosave_manager_PID = NULL;
+static gint autosave_manager_number_of_instances;
+static gint autosave_manager_number_of_instances = 0;
+
+gpointer autosave_manager_ref (gpointer instance);
+void autosave_manager_unref (gpointer instance);
+GParamSpec* param_spec_autosave_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
+void value_set_autosave_manager (GValue* value, gpointer v_object);
+void value_take_autosave_manager (GValue* value, gpointer v_object);
+gpointer value_get_autosave_manager (const GValue* value);
+GType autosave_manager_get_type (void) G_GNUC_CONST;
+gpointer book_ref (gpointer instance);
+void book_unref (gpointer instance);
+GParamSpec* param_spec_book (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
+void value_set_book (GValue* value, gpointer v_object);
+void value_take_book (GValue* value, gpointer v_object);
+gpointer value_get_book (const GValue* value);
+GType book_get_type (void) G_GNUC_CONST;
+gpointer page_ref (gpointer instance);
+void page_unref (gpointer instance);
+GParamSpec* param_spec_page (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
+void value_set_page (GValue* value, gpointer v_object);
+void value_take_page (GValue* value, gpointer v_object);
+gpointer value_get_page (const GValue* value);
+GType page_get_type (void) G_GNUC_CONST;
+#define AUTOSAVE_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_AUTOSAVE_MANAGER, AutosaveManagerPrivate))
+enum  {
+	AUTOSAVE_MANAGER_DUMMY_PROPERTY
+};
+AutosaveManager* autosave_manager_create (Book** book);
+static AutosaveManager* autosave_manager_new (void);
+static AutosaveManager* autosave_manager_construct (GType object_type);
+static sqlite3* autosave_manager_open_database_connection (GError** error);
+static void autosave_manager_recover_book (AutosaveManager* self, Book** book);
+void autosave_manager_set_book (AutosaveManager* self, Book* value);
+guint book_get_n_pages (Book* self);
+Page* book_get_page (Book* self, gint page_number);
+static void autosave_manager_on_page_added (AutosaveManager* self, Page* page);
+static void _page_unref0_ (gpointer var);
+void autosave_manager_cleanup (AutosaveManager* self);
+static void autosave_manager_insert_page (AutosaveManager* self, Page* page);
+void autosave_manager_on_page_changed (AutosaveManager* self, Page* page);
+static void _autosave_manager_on_page_changed_page_size_changed (Page* _sender, gpointer self);
+static void _autosave_manager_on_page_changed_page_scan_direction_changed (Page* _sender, gpointer self);
+static void _autosave_manager_on_page_changed_page_crop_changed (Page* _sender, gpointer self);
+static void _autosave_manager_on_page_changed_page_scan_finished (Page* _sender, gpointer self);
+void autosave_manager_on_page_removed (AutosaveManager* self, Page* page);
+static void _autosave_manager_on_page_changed_page_pixels_changed (Page* _sender, gpointer self);
+Book* autosave_manager_get_book (AutosaveManager* self);
+void autosave_manager_on_reordered (AutosaveManager* self);
+static void autosave_manager_update_page (AutosaveManager* self, Page* page);
+void autosave_manager_on_needs_saving_changed (AutosaveManager* self, Book* book);
+void autosave_manager_on_cleared (AutosaveManager* self);
+static gboolean __lambda2_ (AutosaveManager* self);
+static void autosave_manager_real_update_page (AutosaveManager* self, Page* page);
+static gboolean ___lambda2__gsource_func (gpointer self);
+void page_get_crop (Page* self, gint* x, gint* y, gint* width, gint* height);
+guint book_get_page_index (Book* self, Page* page);
+gint page_get_dpi (Page* self);
+gint page_get_width (Page* self);
+gint page_get_height (Page* self);
+gint page_get_depth (Page* self);
+gint page_get_n_channels (Page* self);
+gint page_get_rowstride (Page* self);
+GType scan_direction_get_type (void) G_GNUC_CONST;
+ScanDirection page_get_scan_direction (Page* self);
+gchar* page_get_color_profile (Page* self);
+guchar* page_get_pixels (Page* self, int* result_length1);
+void book_clear (Book* self);
+Page* book_append_page (Book* self, gint width, gint height, gint dpi, ScanDirection scan_direction);
+ScanPageInfo* scan_page_info_new (void);
+ScanPageInfo* scan_page_info_construct (GType object_type);
+gpointer scan_page_info_ref (gpointer instance);
+void scan_page_info_unref (gpointer instance);
+GParamSpec* param_spec_scan_page_info (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
+void value_set_scan_page_info (GValue* value, gpointer v_object);
+void value_take_scan_page_info (GValue* value, gpointer v_object);
+gpointer value_get_scan_page_info (const GValue* value);
+GType scan_page_info_get_type (void) G_GNUC_CONST;
+void page_set_page_info (Page* self, ScanPageInfo* info);
+void page_set_color_profile (Page* self, const gchar* color_profile);
+void page_set_custom_crop (Page* self, gint width, gint height);
+void page_move_crop (Page* self, gint x, gint y);
+void page_set_pixels (Page* self, guchar* new_pixels, int new_pixels_length1);
+static void _autosave_manager_on_page_added_book_page_added (Book* _sender, Page* page, gpointer self);
+static void _autosave_manager_on_page_removed_book_page_removed (Book* _sender, Page* page, gpointer self);
+static void _autosave_manager_on_reordered_book_reordered (Book* _sender, gpointer self);
+static void _autosave_manager_on_cleared_book_cleared (Book* _sender, gpointer self);
+static void autosave_manager_finalize (AutosaveManager* obj);
+
+
+static gchar* string_strip (const gchar* self) {
+	gchar* result = NULL;
+	gchar* _tmp0_ = NULL;
+	gchar* _result_;
+	const gchar* _tmp1_;
+#line 1085 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (self != NULL, NULL);
+#line 1086 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+	_tmp0_ = g_strdup (self);
+#line 1086 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+	_result_ = _tmp0_;
+#line 1087 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+	_tmp1_ = _result_;
+#line 1087 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+	g_strstrip (_tmp1_);
+#line 1088 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+	result = _result_;
+#line 1088 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+	return result;
+#line 274 "autosave-manager.c"
+}
+
+
+static const gchar* string_to_string (const gchar* self) {
+	const gchar* result = NULL;
+#line 1274 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (self != NULL, NULL);
+#line 1275 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+	result = self;
+#line 1275 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+	return result;
+#line 286 "autosave-manager.c"
+}
+
+
+AutosaveManager* autosave_manager_create (Book** book) {
+	AutosaveManager* result = NULL;
+	gint _tmp0_;
+	AutosaveManager* _tmp1_;
+	AutosaveManager* man;
+	gint _tmp2_;
+	gboolean any_pages_recovered;
+	AutosaveManager* _tmp51_;
+	Book* _tmp52_;
+	gboolean _tmp53_;
+	GError * _inner_error_ = NULL;
+#line 85 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_val_if_fail (*book != NULL, NULL);
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp0_ = autosave_manager_number_of_instances;
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	if (_tmp0_ > 0) {
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_assert_not_reached ();
+#line 309 "autosave-manager.c"
+	}
+#line 95 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp1_ = autosave_manager_new ();
+#line 95 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	man = _tmp1_;
+#line 96 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp2_ = autosave_manager_number_of_instances;
+#line 96 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	autosave_manager_number_of_instances = _tmp2_ + 1;
+#line 319 "autosave-manager.c"
+	{
+		sqlite3* _tmp3_ = NULL;
+		sqlite3* _tmp4_;
+		AutosaveManager* _tmp5_;
+#line 100 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp3_ = autosave_manager_open_database_connection (&_inner_error_);
+#line 100 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp4_ = _tmp3_;
+#line 100 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		if (_inner_error_ != NULL) {
+#line 330 "autosave-manager.c"
+			goto __catch23_g_error;
+		}
+#line 100 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp5_ = man;
+#line 100 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_sqlite3_close0 (_tmp5_->priv->database_connection);
+#line 100 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp5_->priv->database_connection = _tmp4_;
+#line 339 "autosave-manager.c"
+	}
+	goto __finally23;
+	__catch23_g_error:
+	{
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_clear_error (&_inner_error_);
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_inner_error_ = NULL;
+#line 104 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_warning ("autosave-manager.vala:104: Could not connect to the autosave database;" \
+" no autosaves will be kept.");
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		result = NULL;
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_autosave_manager_unref0 (man);
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		return result;
+#line 356 "autosave-manager.c"
+	}
+	__finally23:
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	if (_inner_error_ != NULL) {
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_autosave_manager_unref0 (man);
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_clear_error (&_inner_error_);
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		return NULL;
+#line 369 "autosave-manager.c"
+	}
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	any_pages_recovered = FALSE;
+#line 373 "autosave-manager.c"
+	{
+		gchar* current_pids = NULL;
+		gchar* _tmp6_ = NULL;
+		const gchar* _tmp7_;
+		gchar* _tmp8_ = NULL;
+		sqlite3_stmt* stmt = NULL;
+		const gchar* _tmp9_;
+		const gchar* _tmp10_ = NULL;
+		gchar* _tmp11_ = NULL;
+		gchar* query;
+		AutosaveManager* _tmp12_;
+		sqlite3* _tmp13_;
+		const gchar* _tmp14_;
+		sqlite3_stmt* _tmp15_ = NULL;
+		gint _tmp16_ = 0;
+		gint _result_;
+		gint _tmp17_;
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_spawn_command_line_sync ("pidof simple-scan | sed \"s/ /,/g\"", &_tmp6_, NULL, NULL, &_inner_error_);
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_free0 (current_pids);
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		current_pids = _tmp6_;
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		if (_inner_error_ != NULL) {
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_g_free0 (current_pids);
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			if (_inner_error_->domain == G_SPAWN_ERROR) {
+#line 403 "autosave-manager.c"
+				goto __catch24_g_spawn_error;
+			}
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_g_free0 (current_pids);
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_autosave_manager_unref0 (man);
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			g_clear_error (&_inner_error_);
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			return NULL;
+#line 416 "autosave-manager.c"
+		}
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp7_ = current_pids;
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp8_ = string_strip (_tmp7_);
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_free0 (current_pids);
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		current_pids = _tmp8_;
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp9_ = current_pids;
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp10_ = string_to_string (_tmp9_);
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp11_ = g_strconcat ("\n" \
+"                   SELECT process_id, book_hash, book_revision FROM pa" \
+"ges\n" \
+"                   WHERE NOT process_id IN (", _tmp10_, ")\n                   LIMIT 1\n                ", NULL);
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		query = _tmp11_;
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp12_ = man;
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp13_ = _tmp12_->priv->database_connection;
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp14_ = query;
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp16_ = sqlite3_prepare_v2 (_tmp13_, _tmp14_, -1, &_tmp15_, NULL);
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_sqlite3_finalize0 (stmt);
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		stmt = _tmp15_;
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_result_ = _tmp16_;
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp17_ = _result_;
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		if (_tmp17_ == SQLITE_OK) {
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			while (TRUE) {
+#line 454 "autosave-manager.c"
+				sqlite3_stmt* _tmp18_;
+				gint _tmp19_ = 0;
+				sqlite3_stmt* _tmp20_;
+				gint _tmp21_ = 0;
+				gint unowned_pid;
+				sqlite3_stmt* _tmp22_;
+				gint _tmp23_ = 0;
+				gint book_hash;
+				sqlite3_stmt* _tmp24_;
+				gint _tmp25_ = 0;
+				gint book_revision;
+				const gchar* _tmp26_;
+				const gchar* _tmp27_ = NULL;
+				gchar* _tmp28_ = NULL;
+				sqlite3_stmt* stmt2 = NULL;
+				AutosaveManager* _tmp29_;
+				sqlite3* _tmp30_;
+				const gchar* _tmp31_;
+				sqlite3_stmt* _tmp32_ = NULL;
+				gint _tmp33_ = 0;
+				gint _tmp34_;
+				sqlite3_stmt* _tmp39_;
+				gint _tmp40_;
+				sqlite3_stmt* _tmp41_;
+				gint _tmp42_;
+				sqlite3_stmt* _tmp43_;
+				gint _tmp44_;
+				sqlite3_stmt* _tmp45_;
+				gint _tmp46_ = 0;
+				gint _tmp47_;
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp18_ = stmt;
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp19_ = sqlite3_step (_tmp18_);
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				if (!(_tmp19_ == SQLITE_ROW)) {
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					break;
+#line 493 "autosave-manager.c"
+				}
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				g_debug ("autosave-manager.vala:127: Found at least one autosave page, taking ow" \
+"nership");
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp20_ = stmt;
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp21_ = sqlite3_column_int (_tmp20_, 0);
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				unowned_pid = _tmp21_;
+#line 129 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp22_ = stmt;
+#line 129 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp23_ = sqlite3_column_int (_tmp22_, 1);
+#line 129 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				book_hash = _tmp23_;
+#line 130 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp24_ = stmt;
+#line 130 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp25_ = sqlite3_column_int (_tmp24_, 2);
+#line 130 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				book_revision = _tmp25_;
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp26_ = autosave_manager_PID;
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp27_ = string_to_string (_tmp26_);
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp28_ = g_strconcat ("\n" \
+"                        UPDATE pages\n" \
+"                           SET process_id = ", _tmp27_, "\n" \
+"                         WHERE process_id = ?2\n" \
+"                           AND book_hash = ?3\n" \
+"                           AND book_revision = ?4", NULL);
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_g_free0 (query);
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				query = _tmp28_;
+#line 144 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp29_ = man;
+#line 144 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp30_ = _tmp29_->priv->database_connection;
+#line 144 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp31_ = query;
+#line 144 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp33_ = sqlite3_prepare_v2 (_tmp30_, _tmp31_, -1, &_tmp32_, NULL);
+#line 144 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_sqlite3_finalize0 (stmt2);
+#line 144 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				stmt2 = _tmp32_;
+#line 144 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_result_ = _tmp33_;
+#line 145 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp34_ = _result_;
+#line 145 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				if (_tmp34_ != SQLITE_OK) {
+#line 543 "autosave-manager.c"
+					const gchar* _tmp35_;
+					const gchar* _tmp36_ = NULL;
+					gchar* _tmp37_ = NULL;
+					gchar* _tmp38_;
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp35_ = query;
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp36_ = string_to_string (_tmp35_);
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp37_ = g_strconcat ("Error preparing statement: ", _tmp36_, NULL);
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp38_ = _tmp37_;
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					g_warning ("autosave-manager.vala:146: %s", _tmp38_);
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_g_free0 (_tmp38_);
+#line 560 "autosave-manager.c"
+				}
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp39_ = stmt2;
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp40_ = unowned_pid;
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				sqlite3_bind_int64 (_tmp39_, 2, (gint64) _tmp40_);
+#line 149 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp41_ = stmt2;
+#line 149 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp42_ = book_hash;
+#line 149 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				sqlite3_bind_int64 (_tmp41_, 3, (gint64) _tmp42_);
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp43_ = stmt2;
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp44_ = book_revision;
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				sqlite3_bind_int64 (_tmp43_, 4, (gint64) _tmp44_);
+#line 151 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp45_ = stmt2;
+#line 151 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp46_ = sqlite3_step (_tmp45_);
+#line 151 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_result_ = _tmp46_;
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp47_ = _result_;
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				if (_tmp47_ == SQLITE_DONE) {
+#line 590 "autosave-manager.c"
+					AutosaveManager* _tmp48_;
+#line 154 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					any_pages_recovered = TRUE;
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp48_ = man;
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					autosave_manager_recover_book (_tmp48_, book);
+#line 598 "autosave-manager.c"
+				} else {
+					gint _tmp49_;
+#line 158 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp49_ = _result_;
+#line 158 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					g_warning ("autosave-manager.vala:158: Error %d while executing query", _tmp49_);
+#line 605 "autosave-manager.c"
+				}
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_sqlite3_finalize0 (stmt2);
+#line 609 "autosave-manager.c"
+			}
+		} else {
+			gint _tmp50_;
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp50_ = _result_;
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			g_warning ("autosave-manager.vala:162: Error %d while preparing statement", _tmp50_);
+#line 617 "autosave-manager.c"
+		}
+#line 109 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_free0 (query);
+#line 109 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_sqlite3_finalize0 (stmt);
+#line 109 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_free0 (current_pids);
+#line 625 "autosave-manager.c"
+	}
+	goto __finally24;
+	__catch24_g_spawn_error:
+	{
+		GError* e = NULL;
+#line 109 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		e = _inner_error_;
+#line 109 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_inner_error_ = NULL;
+#line 166 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_warning ("autosave-manager.vala:166: Could not obtain current process ids; not r" \
+"estoring any autosaves");
+#line 109 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_error_free0 (e);
+#line 639 "autosave-manager.c"
+	}
+	__finally24:
+#line 109 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	if (_inner_error_ != NULL) {
+#line 109 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_autosave_manager_unref0 (man);
+#line 109 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 109 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_clear_error (&_inner_error_);
+#line 109 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		return NULL;
+#line 652 "autosave-manager.c"
+	}
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp51_ = man;
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp52_ = *book;
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	autosave_manager_set_book (_tmp51_, _tmp52_);
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp53_ = any_pages_recovered;
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	if (!_tmp53_) {
+#line 664 "autosave-manager.c"
+		{
+			gint i;
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			i = 0;
+#line 669 "autosave-manager.c"
+			{
+				gboolean _tmp54_;
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp54_ = TRUE;
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				while (TRUE) {
+#line 676 "autosave-manager.c"
+					gboolean _tmp55_;
+					gint _tmp57_;
+					Book* _tmp58_;
+					guint _tmp59_ = 0U;
+					Book* _tmp60_;
+					gint _tmp61_;
+					Page* _tmp62_ = NULL;
+					Page* page;
+					AutosaveManager* _tmp63_;
+					Page* _tmp64_;
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp55_ = _tmp54_;
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					if (!_tmp55_) {
+#line 691 "autosave-manager.c"
+						gint _tmp56_;
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						_tmp56_ = i;
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						i = _tmp56_ + 1;
+#line 697 "autosave-manager.c"
+					}
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp54_ = FALSE;
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp57_ = i;
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp58_ = *book;
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp59_ = book_get_n_pages (_tmp58_);
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					if (!(((guint) _tmp57_) < _tmp59_)) {
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						break;
+#line 711 "autosave-manager.c"
+					}
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp60_ = *book;
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp61_ = i;
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp62_ = book_get_page (_tmp60_, _tmp61_);
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					page = _tmp62_;
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp63_ = man;
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp64_ = page;
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					autosave_manager_on_page_added (_tmp63_, _tmp64_);
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_page_unref0 (page);
+#line 729 "autosave-manager.c"
+				}
+			}
+		}
+	}
+#line 179 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	result = man;
+#line 179 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	return result;
+#line 738 "autosave-manager.c"
+}
+
+
+static void _page_unref0_ (gpointer var) {
+#line 184 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	(var == NULL) ? NULL : (var = (page_unref (var), NULL));
+#line 745 "autosave-manager.c"
+}
+
+
+static AutosaveManager* autosave_manager_construct (GType object_type) {
+	AutosaveManager* self = NULL;
+	GHashFunc _tmp0_;
+	GEqualFunc _tmp1_;
+	GHashTable* _tmp2_;
+#line 182 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	self = (AutosaveManager*) g_type_create_instance (object_type);
+#line 184 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp0_ = g_direct_hash;
+#line 184 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp1_ = g_direct_equal;
+#line 184 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp2_ = g_hash_table_new_full (_tmp0_, _tmp1_, _page_unref0_, NULL);
+#line 184 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_g_hash_table_unref0 (self->priv->dirty_pages);
+#line 184 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	self->priv->dirty_pages = _tmp2_;
+#line 182 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	return self;
+#line 768 "autosave-manager.c"
+}
+
+
+static AutosaveManager* autosave_manager_new (void) {
+#line 182 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	return autosave_manager_construct (TYPE_AUTOSAVE_MANAGER);
+#line 775 "autosave-manager.c"
+}
+
+
+static gint _sqlite3_exec (sqlite3* self, const gchar* sql, sqlite3_callback callback, void* callback_target, gchar** errmsg) {
+	gchar* _vala_errmsg = NULL;
+	gint result = 0;
+	const gchar* sqlite_errmsg = NULL;
+	const gchar* _tmp0_;
+	sqlite3_callback _tmp1_;
+	void* _tmp1__target;
+	const gchar* _tmp2_ = NULL;
+	gint _tmp3_ = 0;
+	gint ec;
+	const gchar* _tmp6_;
+#line 34 "/usr/share/vala-0.20/vapi/sqlite3.vapi"
+	g_return_val_if_fail (self != NULL, 0);
+#line 34 "/usr/share/vala-0.20/vapi/sqlite3.vapi"
+	g_return_val_if_fail (sql != NULL, 0);
+#line 36 "/usr/share/vala-0.20/vapi/sqlite3.vapi"
+	_tmp0_ = sql;
+#line 36 "/usr/share/vala-0.20/vapi/sqlite3.vapi"
+	_tmp1_ = callback;
+#line 36 "/usr/share/vala-0.20/vapi/sqlite3.vapi"
+	_tmp1__target = callback_target;
+#line 36 "/usr/share/vala-0.20/vapi/sqlite3.vapi"
+	_tmp3_ = sqlite3_exec (self, _tmp0_, _tmp1_, _tmp1__target, (char**) (&_tmp2_));
+#line 36 "/usr/share/vala-0.20/vapi/sqlite3.vapi"
+	sqlite_errmsg = _tmp2_;
+#line 36 "/usr/share/vala-0.20/vapi/sqlite3.vapi"
+	ec = _tmp3_;
+#line 37 "/usr/share/vala-0.20/vapi/sqlite3.vapi"
+	if ((&_vala_errmsg) != NULL) {
+#line 808 "autosave-manager.c"
+		const gchar* _tmp4_;
+		gchar* _tmp5_;
+#line 38 "/usr/share/vala-0.20/vapi/sqlite3.vapi"
+		_tmp4_ = sqlite_errmsg;
+#line 38 "/usr/share/vala-0.20/vapi/sqlite3.vapi"
+		_tmp5_ = g_strdup (_tmp4_);
+#line 38 "/usr/share/vala-0.20/vapi/sqlite3.vapi"
+		_g_free0 (_vala_errmsg);
+#line 38 "/usr/share/vala-0.20/vapi/sqlite3.vapi"
+		_vala_errmsg = _tmp5_;
+#line 819 "autosave-manager.c"
+	}
+#line 40 "/usr/share/vala-0.20/vapi/sqlite3.vapi"
+	_tmp6_ = sqlite_errmsg;
+#line 40 "/usr/share/vala-0.20/vapi/sqlite3.vapi"
+	sqlite3_free ((void*) _tmp6_);
+#line 41 "/usr/share/vala-0.20/vapi/sqlite3.vapi"
+	result = ec;
+#line 41 "/usr/share/vala-0.20/vapi/sqlite3.vapi"
+	if (errmsg) {
+#line 41 "/usr/share/vala-0.20/vapi/sqlite3.vapi"
+		*errmsg = _vala_errmsg;
+#line 831 "autosave-manager.c"
+	} else {
+#line 41 "/usr/share/vala-0.20/vapi/sqlite3.vapi"
+		_g_free0 (_vala_errmsg);
+#line 835 "autosave-manager.c"
+	}
+#line 41 "/usr/share/vala-0.20/vapi/sqlite3.vapi"
+	return result;
+#line 839 "autosave-manager.c"
+}
+
+
+void autosave_manager_cleanup (AutosaveManager* self) {
+	guint _tmp0_;
+	sqlite3* _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_ = NULL;
+	gchar* _tmp5_ = NULL;
+	gchar* _tmp6_;
+	gint _tmp7_ = 0;
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_if_fail (self != NULL);
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_debug ("autosave-manager.vala:189: Clean exit; deleting autosave records");
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp0_ = self->priv->update_timeout;
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	if (_tmp0_ > ((guint) 0)) {
+#line 859 "autosave-manager.c"
+		guint _tmp1_;
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp1_ = self->priv->update_timeout;
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_source_remove (_tmp1_);
+#line 865 "autosave-manager.c"
+	}
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	self->priv->update_timeout = (guint) 0;
+#line 195 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp2_ = self->priv->database_connection;
+#line 195 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp3_ = autosave_manager_PID;
+#line 195 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp4_ = string_to_string (_tmp3_);
+#line 195 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp5_ = g_strconcat ("\n            DELETE FROM pages\n                WHERE process_id = ", _tmp4_, "\n        ", NULL);
+#line 195 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp6_ = _tmp5_;
+#line 195 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp7_ = _sqlite3_exec (_tmp2_, _tmp6_, NULL, NULL, NULL);
+#line 195 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_warn_if_fail (_tmp7_ == SQLITE_OK);
+#line 195 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_g_free0 (_tmp6_);
+#line 885 "autosave-manager.c"
+}
+
+
+static sqlite3* autosave_manager_open_database_connection (GError** error) {
+	sqlite3* result = NULL;
+	const gchar* _tmp0_;
+	GFile* _tmp1_ = NULL;
+	GFile* autosaves_dir;
+	sqlite3* connection = NULL;
+	const gchar* _tmp3_;
+	sqlite3* _tmp4_ = NULL;
+	gint _tmp5_ = 0;
+	gchar* _tmp7_;
+	gchar* query;
+	sqlite3* _tmp8_;
+	const gchar* _tmp9_;
+	gint _tmp10_ = 0;
+	gint _result_;
+	gint _tmp11_;
+	GError * _inner_error_ = NULL;
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp0_ = autosave_manager_AUTOSAVE_DIR;
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp1_ = g_file_new_for_path (_tmp0_);
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	autosaves_dir = _tmp1_;
+#line 912 "autosave-manager.c"
+	{
+		GFile* _tmp2_;
+#line 206 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp2_ = autosaves_dir;
+#line 206 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_file_make_directory_with_parents (_tmp2_, NULL, &_inner_error_);
+#line 206 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		if (_inner_error_ != NULL) {
+#line 921 "autosave-manager.c"
+			goto __catch25_g_error;
+		}
+	}
+	goto __finally25;
+	__catch25_g_error:
+	{
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_clear_error (&_inner_error_);
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_inner_error_ = NULL;
+#line 932 "autosave-manager.c"
+	}
+	__finally25:
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	if (_inner_error_ != NULL) {
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_propagate_error (error, _inner_error_);
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_object_unref0 (autosaves_dir);
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		return NULL;
+#line 943 "autosave-manager.c"
+	}
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp3_ = autosave_manager_AUTOSAVE_FILENAME;
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp5_ = sqlite3_open (_tmp3_, &_tmp4_);
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_sqlite3_close0 (connection);
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	connection = _tmp4_;
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	if (_tmp5_ != SQLITE_OK) {
+#line 955 "autosave-manager.c"
+		GError* _tmp6_;
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp6_ = g_error_new_literal (G_IO_ERROR, G_IO_ERROR_FAILED, "Could not connect to autosave database");
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_inner_error_ = _tmp6_;
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_propagate_error (error, _inner_error_);
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_sqlite3_close0 (connection);
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_object_unref0 (autosaves_dir);
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		return NULL;
+#line 969 "autosave-manager.c"
+	}
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp7_ = g_strdup ("\n" \
+"            CREATE TABLE IF NOT EXISTS pages (\n" \
+"                id integer PRIMARY KEY,\n" \
+"                process_id integer,\n" \
+"                page_hash integer,\n" \
+"                book_hash integer,\n" \
+"                book_revision integer,\n" \
+"                page_number integer,\n" \
+"                dpi integer,\n" \
+"                width integer,\n" \
+"                height integer,\n" \
+"                depth integer,\n" \
+"                n_channels integer,\n" \
+"                rowstride integer,\n" \
+"                color_profile string,\n" \
+"                crop_x integer,\n" \
+"                crop_y integer,\n" \
+"                crop_width integer,\n" \
+"                crop_height integer,\n" \
+"                scan_direction integer,\n" \
+"                pixels binary\n" \
+"            )");
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	query = _tmp7_;
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp8_ = connection;
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp9_ = query;
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp10_ = _sqlite3_exec (_tmp8_, _tmp9_, NULL, NULL, NULL);
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_result_ = _tmp10_;
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp11_ = _result_;
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	if (_tmp11_ != SQLITE_OK) {
+#line 987 "autosave-manager.c"
+		gint _tmp12_;
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp12_ = _result_;
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_warning ("autosave-manager.vala:239: Error %d while executing query", _tmp12_);
+#line 993 "autosave-manager.c"
+	}
+#line 240 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	result = connection;
+#line 240 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_g_free0 (query);
+#line 240 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_g_object_unref0 (autosaves_dir);
+#line 240 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	return result;
+#line 1003 "autosave-manager.c"
+}
+
+
+static void _autosave_manager_on_page_changed_page_size_changed (Page* _sender, gpointer self) {
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	autosave_manager_on_page_changed (self, _sender);
+#line 1010 "autosave-manager.c"
+}
+
+
+static void _autosave_manager_on_page_changed_page_scan_direction_changed (Page* _sender, gpointer self) {
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	autosave_manager_on_page_changed (self, _sender);
+#line 1017 "autosave-manager.c"
+}
+
+
+static void _autosave_manager_on_page_changed_page_crop_changed (Page* _sender, gpointer self) {
+#line 249 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	autosave_manager_on_page_changed (self, _sender);
+#line 1024 "autosave-manager.c"
+}
+
+
+static void _autosave_manager_on_page_changed_page_scan_finished (Page* _sender, gpointer self) {
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	autosave_manager_on_page_changed (self, _sender);
+#line 1031 "autosave-manager.c"
+}
+
+
+static void autosave_manager_on_page_added (AutosaveManager* self, Page* page) {
+	Page* _tmp0_;
+	Page* _tmp1_;
+	Page* _tmp2_;
+	Page* _tmp3_;
+	Page* _tmp4_;
+#line 243 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_if_fail (self != NULL);
+#line 243 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_if_fail (page != NULL);
+#line 245 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp0_ = page;
+#line 245 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	autosave_manager_insert_page (self, _tmp0_);
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp1_ = page;
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_signal_connect (_tmp1_, "size-changed", (GCallback) _autosave_manager_on_page_changed_page_size_changed, self);
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp2_ = page;
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_signal_connect (_tmp2_, "scan-direction-changed", (GCallback) _autosave_manager_on_page_changed_page_scan_direction_changed, self);
+#line 249 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp3_ = page;
+#line 249 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_signal_connect (_tmp3_, "crop-changed", (GCallback) _autosave_manager_on_page_changed_page_crop_changed, self);
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp4_ = page;
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_signal_connect (_tmp4_, "scan-finished", (GCallback) _autosave_manager_on_page_changed_page_scan_finished, self);
+#line 1065 "autosave-manager.c"
+}
+
+
+static void _autosave_manager_on_page_changed_page_pixels_changed (Page* _sender, gpointer self) {
+#line 255 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	autosave_manager_on_page_changed (self, _sender);
+#line 1072 "autosave-manager.c"
+}
+
+
+void autosave_manager_on_page_removed (AutosaveManager* self, Page* page) {
+	Page* _tmp0_;
+	guint _tmp1_ = 0U;
+	Page* _tmp2_;
+	guint _tmp3_ = 0U;
+	Page* _tmp4_;
+	guint _tmp5_ = 0U;
+	Page* _tmp6_;
+	guint _tmp7_ = 0U;
+	Page* _tmp8_;
+	const gchar* _tmp9_;
+	const gchar* _tmp10_ = NULL;
+	gchar* _tmp11_ = NULL;
+	gchar* query;
+	sqlite3_stmt* stmt = NULL;
+	sqlite3* _tmp12_;
+	const gchar* _tmp13_;
+	sqlite3_stmt* _tmp14_ = NULL;
+	gint _tmp15_ = 0;
+	gint _result_;
+	gint _tmp16_;
+	sqlite3_stmt* _tmp22_;
+	GHashFunc _tmp23_;
+	Page* _tmp24_;
+	guint _tmp25_ = 0U;
+	sqlite3_stmt* _tmp26_;
+	GHashFunc _tmp27_;
+	Book* _tmp28_;
+	Book* _tmp29_;
+	guint _tmp30_ = 0U;
+	sqlite3_stmt* _tmp31_;
+	gint _tmp32_;
+	sqlite3_stmt* _tmp33_;
+	gint _tmp34_ = 0;
+	gint _tmp35_;
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_if_fail (self != NULL);
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_if_fail (page != NULL);
+#line 255 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp0_ = page;
+#line 255 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_signal_parse_name ("pixels-changed", TYPE_PAGE, &_tmp1_, NULL, FALSE);
+#line 255 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _autosave_manager_on_page_changed_page_pixels_changed, self);
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp2_ = page;
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_signal_parse_name ("size-changed", TYPE_PAGE, &_tmp3_, NULL, FALSE);
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _autosave_manager_on_page_changed_page_size_changed, self);
+#line 257 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp4_ = page;
+#line 257 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_signal_parse_name ("scan-direction-changed", TYPE_PAGE, &_tmp5_, NULL, FALSE);
+#line 257 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _autosave_manager_on_page_changed_page_scan_direction_changed, self);
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp6_ = page;
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_signal_parse_name ("crop-changed", TYPE_PAGE, &_tmp7_, NULL, FALSE);
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _autosave_manager_on_page_changed_page_crop_changed, self);
+#line 259 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp8_ = page;
+#line 259 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_signal_connect (_tmp8_, "scan-finished", (GCallback) _autosave_manager_on_page_changed_page_scan_finished, self);
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp9_ = autosave_manager_PID;
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp10_ = string_to_string (_tmp9_);
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp11_ = g_strconcat ("\n        DELETE FROM pages\n            WHERE process_id = ", _tmp10_, "\n" \
+"              AND page_hash = ?2\n" \
+"              AND book_hash = ?3\n" \
+"              AND book_revision = ?4\n" \
+"        ", NULL);
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	query = _tmp11_;
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp12_ = self->priv->database_connection;
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp13_ = query;
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp15_ = sqlite3_prepare_v2 (_tmp12_, _tmp13_, -1, &_tmp14_, NULL);
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_sqlite3_finalize0 (stmt);
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	stmt = _tmp14_;
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_result_ = _tmp15_;
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp16_ = _result_;
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	if (_tmp16_ != SQLITE_OK) {
+#line 1167 "autosave-manager.c"
+		gint _tmp17_;
+		gchar* _tmp18_ = NULL;
+		gchar* _tmp19_;
+		gchar* _tmp20_ = NULL;
+		gchar* _tmp21_;
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp17_ = _result_;
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp18_ = g_strdup_printf ("%i", _tmp17_);
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp19_ = _tmp18_;
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp20_ = g_strconcat ("Error ", _tmp19_, " while preparing query", NULL);
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp21_ = _tmp20_;
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_warning ("autosave-manager.vala:271: %s", _tmp21_);
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_free0 (_tmp21_);
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_free0 (_tmp19_);
+#line 1189 "autosave-manager.c"
+	}
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp22_ = stmt;
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp23_ = g_direct_hash;
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp24_ = page;
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp25_ = _tmp23_ (_tmp24_);
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	sqlite3_bind_int64 (_tmp22_, 2, (gint64) _tmp25_);
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp26_ = stmt;
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp27_ = g_direct_hash;
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp28_ = autosave_manager_get_book (self);
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp29_ = _tmp28_;
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp30_ = _tmp27_ (_tmp29_);
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	sqlite3_bind_int64 (_tmp26_, 3, (gint64) _tmp30_);
+#line 274 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp31_ = stmt;
+#line 274 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp32_ = self->priv->cur_book_revision;
+#line 274 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	sqlite3_bind_int64 (_tmp31_, 4, (gint64) _tmp32_);
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp33_ = stmt;
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp34_ = sqlite3_step (_tmp33_);
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_result_ = _tmp34_;
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp35_ = _result_;
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	if (_tmp35_ != SQLITE_DONE) {
+#line 1229 "autosave-manager.c"
+		gint _tmp36_;
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp36_ = _result_;
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_warning ("autosave-manager.vala:278: Error %d while executing query", _tmp36_);
+#line 1235 "autosave-manager.c"
+	}
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_sqlite3_finalize0 (stmt);
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_g_free0 (query);
+#line 1241 "autosave-manager.c"
+}
+
+
+void autosave_manager_on_reordered (AutosaveManager* self) {
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_if_fail (self != NULL);
+#line 1248 "autosave-manager.c"
+	{
+		gint i;
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		i = 0;
+#line 1253 "autosave-manager.c"
+		{
+			gboolean _tmp0_;
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp0_ = TRUE;
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			while (TRUE) {
+#line 1260 "autosave-manager.c"
+				gboolean _tmp1_;
+				gint _tmp3_;
+				Book* _tmp4_;
+				Book* _tmp5_;
+				guint _tmp6_ = 0U;
+				Book* _tmp7_;
+				Book* _tmp8_;
+				gint _tmp9_;
+				Page* _tmp10_ = NULL;
+				Page* page;
+				const gchar* _tmp11_;
+				const gchar* _tmp12_ = NULL;
+				gchar* _tmp13_ = NULL;
+				gchar* query;
+				sqlite3_stmt* stmt = NULL;
+				sqlite3* _tmp14_;
+				const gchar* _tmp15_;
+				sqlite3_stmt* _tmp16_ = NULL;
+				gint _tmp17_ = 0;
+				gint _result_;
+				gint _tmp18_;
+				sqlite3_stmt* _tmp24_;
+				gint _tmp25_;
+				sqlite3_stmt* _tmp26_;
+				GHashFunc _tmp27_;
+				Page* _tmp28_;
+				guint _tmp29_ = 0U;
+				sqlite3_stmt* _tmp30_;
+				GHashFunc _tmp31_;
+				Book* _tmp32_;
+				Book* _tmp33_;
+				guint _tmp34_ = 0U;
+				sqlite3_stmt* _tmp35_;
+				gint _tmp36_;
+				sqlite3_stmt* _tmp37_;
+				gint _tmp38_ = 0;
+				gint _tmp39_;
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp1_ = _tmp0_;
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				if (!_tmp1_) {
+#line 1302 "autosave-manager.c"
+					gint _tmp2_;
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp2_ = i;
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					i = _tmp2_ + 1;
+#line 1308 "autosave-manager.c"
+				}
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp0_ = FALSE;
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp3_ = i;
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp4_ = autosave_manager_get_book (self);
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp5_ = _tmp4_;
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp6_ = book_get_n_pages (_tmp5_);
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				if (!(((guint) _tmp3_) < _tmp6_)) {
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					break;
+#line 1324 "autosave-manager.c"
+				}
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp7_ = autosave_manager_get_book (self);
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp8_ = _tmp7_;
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp9_ = i;
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp10_ = book_get_page (_tmp8_, _tmp9_);
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				page = _tmp10_;
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp11_ = autosave_manager_PID;
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp12_ = string_to_string (_tmp11_);
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp13_ = g_strconcat ("\n" \
+"            UPDATE pages SET page_number = ?5\n" \
+"            WHERE process_id = ", _tmp12_, "\n" \
+"              AND page_hash = ?2\n" \
+"              AND book_hash = ?3\n" \
+"              AND book_revision = ?4\n" \
+"            ", NULL);
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				query = _tmp13_;
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp14_ = self->priv->database_connection;
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp15_ = query;
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp17_ = sqlite3_prepare_v2 (_tmp14_, _tmp15_, -1, &_tmp16_, NULL);
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_sqlite3_finalize0 (stmt);
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				stmt = _tmp16_;
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_result_ = _tmp17_;
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp18_ = _result_;
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				if (_tmp18_ != SQLITE_OK) {
+#line 1360 "autosave-manager.c"
+					gint _tmp19_;
+					gchar* _tmp20_ = NULL;
+					gchar* _tmp21_;
+					gchar* _tmp22_ = NULL;
+					gchar* _tmp23_;
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp19_ = _result_;
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp20_ = g_strdup_printf ("%i", _tmp19_);
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp21_ = _tmp20_;
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp22_ = g_strconcat ("Error ", _tmp21_, " while preparing query", NULL);
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp23_ = _tmp22_;
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					g_warning ("autosave-manager.vala:296: %s", _tmp23_);
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_g_free0 (_tmp23_);
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_g_free0 (_tmp21_);
+#line 1382 "autosave-manager.c"
+				}
+#line 298 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp24_ = stmt;
+#line 298 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp25_ = i;
+#line 298 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				sqlite3_bind_int64 (_tmp24_, 5, (gint64) _tmp25_);
+#line 299 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp26_ = stmt;
+#line 299 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp27_ = g_direct_hash;
+#line 299 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp28_ = page;
+#line 299 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp29_ = _tmp27_ (_tmp28_);
+#line 299 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				sqlite3_bind_int64 (_tmp26_, 2, (gint64) _tmp29_);
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp30_ = stmt;
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp31_ = g_direct_hash;
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp32_ = autosave_manager_get_book (self);
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp33_ = _tmp32_;
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp34_ = _tmp31_ (_tmp33_);
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				sqlite3_bind_int64 (_tmp30_, 3, (gint64) _tmp34_);
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp35_ = stmt;
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp36_ = self->priv->cur_book_revision;
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				sqlite3_bind_int64 (_tmp35_, 4, (gint64) _tmp36_);
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp37_ = stmt;
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp38_ = sqlite3_step (_tmp37_);
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_result_ = _tmp38_;
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp39_ = _result_;
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				if (_tmp39_ != SQLITE_DONE) {
+#line 1428 "autosave-manager.c"
+					gint _tmp40_;
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp40_ = _result_;
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					g_warning ("autosave-manager.vala:305: Error %d while executing query", _tmp40_);
+#line 1434 "autosave-manager.c"
+				}
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_sqlite3_finalize0 (stmt);
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_g_free0 (query);
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_page_unref0 (page);
+#line 1442 "autosave-manager.c"
+			}
+		}
+	}
+}
+
+
+void autosave_manager_on_page_changed (AutosaveManager* self, Page* page) {
+	Page* _tmp0_;
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_if_fail (self != NULL);
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_if_fail (page != NULL);
+#line 311 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp0_ = page;
+#line 311 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	autosave_manager_update_page (self, _tmp0_);
+#line 1459 "autosave-manager.c"
+}
+
+
+void autosave_manager_on_needs_saving_changed (AutosaveManager* self, Book* book) {
+#line 314 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_if_fail (self != NULL);
+#line 314 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_if_fail (book != NULL);
+#line 1468 "autosave-manager.c"
+	{
+		gint n;
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		n = 0;
+#line 1473 "autosave-manager.c"
+		{
+			gboolean _tmp0_;
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp0_ = TRUE;
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			while (TRUE) {
+#line 1480 "autosave-manager.c"
+				gboolean _tmp1_;
+				gint _tmp3_;
+				Book* _tmp4_;
+				guint _tmp5_ = 0U;
+				Book* _tmp6_;
+				gint _tmp7_;
+				Page* _tmp8_ = NULL;
+				Page* page;
+				Page* _tmp9_;
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp1_ = _tmp0_;
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				if (!_tmp1_) {
+#line 1494 "autosave-manager.c"
+					gint _tmp2_;
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp2_ = n;
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					n = _tmp2_ + 1;
+#line 1500 "autosave-manager.c"
+				}
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp0_ = FALSE;
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp3_ = n;
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp4_ = book;
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp5_ = book_get_n_pages (_tmp4_);
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				if (!(((guint) _tmp3_) < _tmp5_)) {
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					break;
+#line 1514 "autosave-manager.c"
+				}
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp6_ = book;
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp7_ = n;
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp8_ = book_get_page (_tmp6_, _tmp7_);
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				page = _tmp8_;
+#line 319 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp9_ = page;
+#line 319 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				autosave_manager_update_page (self, _tmp9_);
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_page_unref0 (page);
+#line 1530 "autosave-manager.c"
+			}
+		}
+	}
+}
+
+
+void autosave_manager_on_cleared (AutosaveManager* self) {
+	gint _tmp0_;
+#line 325 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_if_fail (self != NULL);
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp0_ = self->priv->cur_book_revision;
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	self->priv->cur_book_revision = _tmp0_ + 1;
+#line 1545 "autosave-manager.c"
+}
+
+
+static void autosave_manager_insert_page (AutosaveManager* self, Page* page) {
+	const gchar* _tmp0_;
+	const gchar* _tmp1_ = NULL;
+	gchar* _tmp2_ = NULL;
+	gchar* query;
+	sqlite3_stmt* stmt = NULL;
+	sqlite3* _tmp3_;
+	const gchar* _tmp4_;
+	sqlite3_stmt* _tmp5_ = NULL;
+	gint _tmp6_ = 0;
+	gint _result_;
+	gint _tmp7_;
+	sqlite3_stmt* _tmp13_;
+	GHashFunc _tmp14_;
+	Page* _tmp15_;
+	guint _tmp16_ = 0U;
+	sqlite3_stmt* _tmp17_;
+	GHashFunc _tmp18_;
+	Book* _tmp19_;
+	Book* _tmp20_;
+	guint _tmp21_ = 0U;
+	sqlite3_stmt* _tmp22_;
+	gint _tmp23_;
+	sqlite3_stmt* _tmp24_;
+	gint _tmp25_ = 0;
+	gint _tmp26_;
+	Page* _tmp28_;
+#line 330 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_if_fail (self != NULL);
+#line 330 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_if_fail (page != NULL);
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_debug ("autosave-manager.vala:332: Adding an autosave for a new page");
+#line 333 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp0_ = autosave_manager_PID;
+#line 333 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp1_ = string_to_string (_tmp0_);
+#line 333 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp2_ = g_strconcat ("\n" \
+"            INSERT INTO pages\n" \
+"                (process_id,\n" \
+"                page_hash,\n" \
+"                book_hash,\n" \
+"                book_revision)\n" \
+"                VALUES\n" \
+"                (", _tmp1_, ",\n" \
+"                ?2,\n" \
+"                ?3,\n" \
+"                ?4)\n" \
+"        ", NULL);
+#line 333 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	query = _tmp2_;
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp3_ = self->priv->database_connection;
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp4_ = query;
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp6_ = sqlite3_prepare_v2 (_tmp3_, _tmp4_, -1, &_tmp5_, NULL);
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_sqlite3_finalize0 (stmt);
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	stmt = _tmp5_;
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_result_ = _tmp6_;
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp7_ = _result_;
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	if (_tmp7_ != SQLITE_OK) {
+#line 1606 "autosave-manager.c"
+		gint _tmp8_;
+		gchar* _tmp9_ = NULL;
+		gchar* _tmp10_;
+		gchar* _tmp11_ = NULL;
+		gchar* _tmp12_;
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp8_ = _result_;
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp9_ = g_strdup_printf ("%i", _tmp8_);
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp10_ = _tmp9_;
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp11_ = g_strconcat ("Error ", _tmp10_, " while preparing query", NULL);
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp12_ = _tmp11_;
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_warning ("autosave-manager.vala:348: %s", _tmp12_);
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_free0 (_tmp12_);
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_free0 (_tmp10_);
+#line 1628 "autosave-manager.c"
+	}
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp13_ = stmt;
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp14_ = g_direct_hash;
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp15_ = page;
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp16_ = _tmp14_ (_tmp15_);
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	sqlite3_bind_int64 (_tmp13_, 2, (gint64) _tmp16_);
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp17_ = stmt;
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp18_ = g_direct_hash;
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp19_ = autosave_manager_get_book (self);
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp20_ = _tmp19_;
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp21_ = _tmp18_ (_tmp20_);
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	sqlite3_bind_int64 (_tmp17_, 3, (gint64) _tmp21_);
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp22_ = stmt;
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp23_ = self->priv->cur_book_revision;
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	sqlite3_bind_int64 (_tmp22_, 4, (gint64) _tmp23_);
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp24_ = stmt;
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp25_ = sqlite3_step (_tmp24_);
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_result_ = _tmp25_;
+#line 355 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp26_ = _result_;
+#line 355 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	if (_tmp26_ != SQLITE_DONE) {
+#line 1668 "autosave-manager.c"
+		gint _tmp27_;
+#line 356 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp27_ = _result_;
+#line 356 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_warning ("autosave-manager.vala:356: Error %d while executing query", _tmp27_);
+#line 1674 "autosave-manager.c"
+	}
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp28_ = page;
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	autosave_manager_update_page (self, _tmp28_);
+#line 330 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_sqlite3_finalize0 (stmt);
+#line 330 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_g_free0 (query);
+#line 1684 "autosave-manager.c"
+}
+
+
+static gpointer _page_ref0 (gpointer self) {
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	return self ? page_ref (self) : NULL;
+#line 1691 "autosave-manager.c"
+}
+
+
+static gboolean __lambda2_ (AutosaveManager* self) {
+	gboolean result = FALSE;
+	GHashTable* _tmp0_;
+	GHashTableIter iter = {0};
+	Page* p = NULL;
+	gboolean is_dirty = FALSE;
+	GHashTable* _tmp6_;
+#line 368 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp0_ = self->priv->dirty_pages;
+#line 368 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_hash_table_iter_init (&iter, _tmp0_);
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	while (TRUE) {
+#line 1708 "autosave-manager.c"
+		gconstpointer _tmp1_ = NULL;
+		gconstpointer _tmp2_ = NULL;
+		gboolean _tmp3_ = FALSE;
+		Page* _tmp4_;
+		Page* _tmp5_;
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp3_ = g_hash_table_iter_next (&iter, &_tmp1_, &_tmp2_);
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_page_unref0 (p);
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp4_ = _page_ref0 (_tmp1_);
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		p = _tmp4_;
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		is_dirty = _tmp2_;
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		if (!_tmp3_) {
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			break;
+#line 1728 "autosave-manager.c"
+		}
+#line 372 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp5_ = p;
+#line 372 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		autosave_manager_real_update_page (self, _tmp5_);
+#line 1734 "autosave-manager.c"
+	}
+#line 374 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp6_ = self->priv->dirty_pages;
+#line 374 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_hash_table_remove_all (_tmp6_);
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	self->priv->update_timeout = (guint) 0;
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	result = FALSE;
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_page_unref0 (p);
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	return result;
+#line 1748 "autosave-manager.c"
+}
+
+
+static gboolean ___lambda2__gsource_func (gpointer self) {
+	gboolean result;
+	result = __lambda2_ (self);
+#line 366 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	return result;
+#line 1757 "autosave-manager.c"
+}
+
+
+static void autosave_manager_update_page (AutosaveManager* self, Page* page) {
+	GHashTable* _tmp0_;
+	Page* _tmp1_;
+	Page* _tmp2_;
+	guint _tmp3_;
+	guint _tmp5_ = 0U;
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_if_fail (self != NULL);
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_if_fail (page != NULL);
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp0_ = self->priv->dirty_pages;
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp1_ = page;
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp2_ = _page_ref0 (_tmp1_);
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_hash_table_insert (_tmp0_, _tmp2_, (gpointer) ((gintptr) TRUE));
+#line 364 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp3_ = self->priv->update_timeout;
+#line 364 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	if (_tmp3_ > ((guint) 0)) {
+#line 1783 "autosave-manager.c"
+		guint _tmp4_;
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp4_ = self->priv->update_timeout;
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_source_remove (_tmp4_);
+#line 1789 "autosave-manager.c"
+	}
+#line 366 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp5_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 100, ___lambda2__gsource_func, autosave_manager_ref (self), autosave_manager_unref);
+#line 366 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	self->priv->update_timeout = _tmp5_;
+#line 1795 "autosave-manager.c"
+}
+
+
+static void autosave_manager_real_update_page (AutosaveManager* self, Page* page) {
+	gint crop_x = 0;
+	gint crop_y = 0;
+	gint crop_width = 0;
+	gint crop_height = 0;
+	Page* _tmp0_;
+	gint _tmp1_ = 0;
+	gint _tmp2_ = 0;
+	gint _tmp3_ = 0;
+	gint _tmp4_ = 0;
+	sqlite3_stmt* stmt = NULL;
+	Book* _tmp5_;
+	Book* _tmp6_;
+	Page* _tmp7_;
+	guint _tmp8_ = 0U;
+	gchar* _tmp9_ = NULL;
+	gchar* _tmp10_;
+	Page* _tmp11_;
+	gint _tmp12_ = 0;
+	gchar* _tmp13_ = NULL;
+	gchar* _tmp14_;
+	Page* _tmp15_;
+	gint _tmp16_ = 0;
+	gchar* _tmp17_ = NULL;
+	gchar* _tmp18_;
+	Page* _tmp19_;
+	gint _tmp20_ = 0;
+	gchar* _tmp21_ = NULL;
+	gchar* _tmp22_;
+	Page* _tmp23_;
+	gint _tmp24_ = 0;
+	gchar* _tmp25_ = NULL;
+	gchar* _tmp26_;
+	Page* _tmp27_;
+	gint _tmp28_ = 0;
+	gchar* _tmp29_ = NULL;
+	gchar* _tmp30_;
+	Page* _tmp31_;
+	gint _tmp32_ = 0;
+	gchar* _tmp33_ = NULL;
+	gchar* _tmp34_;
+	gint _tmp35_;
+	gchar* _tmp36_ = NULL;
+	gchar* _tmp37_;
+	gint _tmp38_;
+	gchar* _tmp39_ = NULL;
+	gchar* _tmp40_;
+	gint _tmp41_;
+	gchar* _tmp42_ = NULL;
+	gchar* _tmp43_;
+	gint _tmp44_;
+	gchar* _tmp45_ = NULL;
+	gchar* _tmp46_;
+	Page* _tmp47_;
+	ScanDirection _tmp48_ = 0;
+	gchar* _tmp49_ = NULL;
+	gchar* _tmp50_;
+	const gchar* _tmp51_;
+	const gchar* _tmp52_ = NULL;
+	gchar* _tmp53_ = NULL;
+	gchar* _tmp54_;
+	gchar* query;
+	sqlite3* _tmp55_;
+	const gchar* _tmp56_;
+	sqlite3_stmt* _tmp57_ = NULL;
+	gint _tmp58_ = 0;
+	gint _result_;
+	gint _tmp59_;
+	sqlite3_stmt* _tmp61_;
+	GHashFunc _tmp62_;
+	Page* _tmp63_;
+	guint _tmp64_ = 0U;
+	sqlite3_stmt* _tmp65_;
+	GHashFunc _tmp66_;
+	Book* _tmp67_;
+	Book* _tmp68_;
+	guint _tmp69_ = 0U;
+	sqlite3_stmt* _tmp70_;
+	gint _tmp71_;
+	Page* _tmp72_;
+	gchar* _tmp73_ = NULL;
+	gchar* _tmp74_;
+	const gchar* _tmp75_;
+	sqlite3_stmt* _tmp77_;
+	const gchar* _tmp78_;
+	gchar* _tmp79_;
+	GDestroyNotify _tmp80_;
+	gint _tmp81_ = 0;
+	gint _tmp82_;
+	Page* _tmp84_;
+	gint _tmp85_ = 0;
+	guchar* _tmp86_ = NULL;
+	sqlite3_stmt* _tmp99_;
+	gint _tmp100_ = 0;
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_if_fail (self != NULL);
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_if_fail (page != NULL);
+#line 383 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_debug ("autosave-manager.vala:383: Updating the autosave for a page");
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp0_ = page;
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	page_get_crop (_tmp0_, &_tmp1_, &_tmp2_, &_tmp3_, &_tmp4_);
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	crop_x = _tmp1_;
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	crop_y = _tmp2_;
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	crop_width = _tmp3_;
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	crop_height = _tmp4_;
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp5_ = autosave_manager_get_book (self);
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp6_ = _tmp5_;
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp7_ = page;
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp8_ = book_get_page_index (_tmp6_, _tmp7_);
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp9_ = g_strdup_printf ("%u", _tmp8_);
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp10_ = _tmp9_;
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp11_ = page;
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp12_ = page_get_dpi (_tmp11_);
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp13_ = g_strdup_printf ("%i", _tmp12_);
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp14_ = _tmp13_;
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp15_ = page;
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp16_ = page_get_width (_tmp15_);
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp17_ = g_strdup_printf ("%i", _tmp16_);
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp18_ = _tmp17_;
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp19_ = page;
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp20_ = page_get_height (_tmp19_);
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp21_ = g_strdup_printf ("%i", _tmp20_);
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp22_ = _tmp21_;
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp23_ = page;
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp24_ = page_get_depth (_tmp23_);
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp25_ = g_strdup_printf ("%i", _tmp24_);
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp26_ = _tmp25_;
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp27_ = page;
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp28_ = page_get_n_channels (_tmp27_);
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp29_ = g_strdup_printf ("%i", _tmp28_);
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp30_ = _tmp29_;
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp31_ = page;
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp32_ = page_get_rowstride (_tmp31_);
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp33_ = g_strdup_printf ("%i", _tmp32_);
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp34_ = _tmp33_;
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp35_ = crop_x;
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp36_ = g_strdup_printf ("%i", _tmp35_);
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp37_ = _tmp36_;
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp38_ = crop_y;
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp39_ = g_strdup_printf ("%i", _tmp38_);
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp40_ = _tmp39_;
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp41_ = crop_width;
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp42_ = g_strdup_printf ("%i", _tmp41_);
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp43_ = _tmp42_;
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp44_ = crop_height;
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp45_ = g_strdup_printf ("%i", _tmp44_);
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp46_ = _tmp45_;
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp47_ = page;
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp48_ = page_get_scan_direction (_tmp47_);
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp49_ = g_strdup_printf ("%i", (gint) _tmp48_);
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp50_ = _tmp49_;
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp51_ = autosave_manager_PID;
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp52_ = string_to_string (_tmp51_);
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp53_ = g_strconcat ("\n" \
+"            UPDATE pages\n" \
+"                SET\n" \
+"                page_number=", _tmp10_, ",\n                dpi=", _tmp14_, ",\n                width=", _tmp18_, ",\n                height=", _tmp22_, ",\n                depth=", _tmp26_, ",\n                n_channels=", _tmp30_, ",\n                rowstride=", _tmp34_, ",\n                crop_x=", _tmp37_, ",\n                crop_y=", _tmp40_, ",\n                crop_width=", _tmp43_, ",\n                crop_height=", _tmp46_, ",\n                scan_direction=", _tmp50_, ",\n" \
+"                color_profile=?1,\n" \
+"                pixels=?2\n" \
+"                WHERE process_id = ", _tmp52_, "\n" \
+"                  AND page_hash = ?4\n" \
+"                  AND book_hash = ?5\n" \
+"                  AND book_revision = ?6\n" \
+"            ", NULL);
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp54_ = _tmp53_;
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_g_free0 (_tmp50_);
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_g_free0 (_tmp46_);
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_g_free0 (_tmp43_);
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_g_free0 (_tmp40_);
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_g_free0 (_tmp37_);
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_g_free0 (_tmp34_);
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_g_free0 (_tmp30_);
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_g_free0 (_tmp26_);
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_g_free0 (_tmp22_);
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_g_free0 (_tmp18_);
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_g_free0 (_tmp14_);
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_g_free0 (_tmp10_);
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	query = _tmp54_;
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp55_ = self->priv->database_connection;
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp56_ = query;
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp58_ = sqlite3_prepare_v2 (_tmp55_, _tmp56_, -1, &_tmp57_, NULL);
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_sqlite3_finalize0 (stmt);
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	stmt = _tmp57_;
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_result_ = _tmp58_;
+#line 416 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp59_ = _result_;
+#line 416 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	if (_tmp59_ != SQLITE_OK) {
+#line 2053 "autosave-manager.c"
+		gint _tmp60_;
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp60_ = _result_;
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_warning ("autosave-manager.vala:418: Error %d while preparing statement", _tmp60_);
+#line 419 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_free0 (query);
+#line 419 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_sqlite3_finalize0 (stmt);
+#line 419 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		return;
+#line 2065 "autosave-manager.c"
+	}
+#line 422 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp61_ = stmt;
+#line 422 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp62_ = g_direct_hash;
+#line 422 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp63_ = page;
+#line 422 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp64_ = _tmp62_ (_tmp63_);
+#line 422 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	sqlite3_bind_int64 (_tmp61_, 4, (gint64) _tmp64_);
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp65_ = stmt;
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp66_ = g_direct_hash;
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp67_ = autosave_manager_get_book (self);
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp68_ = _tmp67_;
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp69_ = _tmp66_ (_tmp68_);
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	sqlite3_bind_int64 (_tmp65_, 5, (gint64) _tmp69_);
+#line 424 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp70_ = stmt;
+#line 424 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp71_ = self->priv->cur_book_revision;
+#line 424 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	sqlite3_bind_int64 (_tmp70_, 6, (gint64) _tmp71_);
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp72_ = page;
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp73_ = page_get_color_profile (_tmp72_);
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp74_ = _tmp73_;
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp75_ = _tmp74_;
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	if (_tmp75_ == NULL) {
+#line 2105 "autosave-manager.c"
+		gchar* _tmp76_;
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp76_ = g_strdup ("");
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_free0 (_tmp74_);
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp74_ = _tmp76_;
+#line 2113 "autosave-manager.c"
+	}
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp77_ = stmt;
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp78_ = _tmp74_;
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp79_ = g_strdup (_tmp78_);
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp80_ = g_free;
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp81_ = sqlite3_bind_text (_tmp77_, 1, _tmp79_, -1, _tmp80_);
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_result_ = _tmp81_;
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp82_ = _result_;
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	if (_tmp82_ != SQLITE_OK) {
+#line 2131 "autosave-manager.c"
+		gint _tmp83_;
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp83_ = _result_;
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_warning ("autosave-manager.vala:428: Error %d while binding text", _tmp83_);
+#line 2137 "autosave-manager.c"
+	}
+#line 430 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp84_ = page;
+#line 430 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp86_ = page_get_pixels (_tmp84_, &_tmp85_);
+#line 430 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	if (_tmp86_ != NULL) {
+#line 2145 "autosave-manager.c"
+		sqlite3_stmt* _tmp87_;
+		Page* _tmp88_;
+		gint _tmp89_ = 0;
+		guchar* _tmp90_ = NULL;
+		Page* _tmp91_;
+		gint _tmp92_ = 0;
+		guchar* _tmp93_ = NULL;
+		gint _tmp94_ = 0;
+		gint _tmp95_;
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp87_ = stmt;
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp88_ = page;
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp90_ = page_get_pixels (_tmp88_, &_tmp89_);
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp91_ = page;
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp93_ = page_get_pixels (_tmp91_, &_tmp92_);
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp94_ = sqlite3_bind_blob (_tmp87_, 2, _tmp90_, _tmp92_, (GDestroyNotify) (-1));
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_result_ = _tmp94_;
+#line 434 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp95_ = _result_;
+#line 434 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		if (_tmp95_ != SQLITE_OK) {
+#line 2173 "autosave-manager.c"
+			gint _tmp96_;
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp96_ = _result_;
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			g_warning ("autosave-manager.vala:435: Error %d while binding blob", _tmp96_);
+#line 2179 "autosave-manager.c"
+		}
+	} else {
+		sqlite3_stmt* _tmp97_;
+		gint _tmp98_ = 0;
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp97_ = stmt;
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp98_ = sqlite3_bind_null (_tmp97_, 2);
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_warn_if_fail (_tmp98_ == SQLITE_OK);
+#line 2190 "autosave-manager.c"
+	}
+#line 440 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp99_ = stmt;
+#line 440 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp100_ = sqlite3_step (_tmp99_);
+#line 440 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_warn_if_fail (_tmp100_ == SQLITE_DONE);
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_g_free0 (_tmp74_);
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_g_free0 (query);
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_sqlite3_finalize0 (stmt);
+#line 2204 "autosave-manager.c"
+}
+
+
+static void autosave_manager_recover_book (AutosaveManager* self, Book** book) {
+	sqlite3_stmt* stmt = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_ = NULL;
+	gchar* _tmp4_ = NULL;
+	gchar* query;
+	sqlite3* _tmp5_;
+	const gchar* _tmp6_;
+	sqlite3_stmt* _tmp7_ = NULL;
+	gint _tmp8_ = 0;
+	gint _result_;
+	gint _tmp9_;
+	gboolean first;
+	gboolean _tmp125_;
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_if_fail (self != NULL);
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_if_fail (*book != NULL);
+#line 446 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp0_ = autosave_manager_PID;
+#line 446 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp1_ = string_to_string (_tmp0_);
+#line 446 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp2_ = autosave_manager_PID;
+#line 446 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp3_ = string_to_string (_tmp2_);
+#line 446 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp4_ = g_strconcat ("\n" \
+"            SELECT process_id,\n" \
+"                page_hash,\n" \
+"                book_hash,\n" \
+"                book_revision,\n" \
+"                page_number,\n" \
+"                dpi,\n" \
+"                width,\n" \
+"                height,\n" \
+"                depth,\n" \
+"                n_channels,\n" \
+"                rowstride,\n" \
+"                color_profile,\n" \
+"                crop_x,\n" \
+"                crop_y,\n" \
+"                crop_width,\n" \
+"                crop_height,\n" \
+"                scan_direction,\n" \
+"                pixels,\n" \
+"                id\n" \
+"            FROM pages\n" \
+"            WHERE process_id = ", _tmp1_, "\n" \
+"              AND book_revision = (\n" \
+"                  SELECT MAX(book_revision) FROM pages WHERE process_i" \
+"d = ", _tmp3_, "\n              )\n            ORDER BY page_number\n        ", NULL);
+#line 446 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	query = _tmp4_;
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp5_ = self->priv->database_connection;
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp6_ = query;
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp8_ = sqlite3_prepare_v2 (_tmp5_, _tmp6_, -1, &_tmp7_, NULL);
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_sqlite3_finalize0 (stmt);
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	stmt = _tmp7_;
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_result_ = _tmp8_;
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp9_ = _result_;
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	if (_tmp9_ != SQLITE_OK) {
+#line 2256 "autosave-manager.c"
+		gint _tmp10_;
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp10_ = _result_;
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_warning ("autosave-manager.vala:476: Error %d while preparing statement", _tmp10_);
+#line 2262 "autosave-manager.c"
+	}
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	first = TRUE;
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	while (TRUE) {
+#line 2268 "autosave-manager.c"
+		sqlite3_stmt* _tmp11_;
+		gint _tmp12_ = 0;
+		gboolean _tmp13_;
+		sqlite3_stmt* _tmp15_;
+		gint _tmp16_ = 0;
+		gint dpi;
+		sqlite3_stmt* _tmp17_;
+		gint _tmp18_ = 0;
+		gint width;
+		sqlite3_stmt* _tmp19_;
+		gint _tmp20_ = 0;
+		gint height;
+		sqlite3_stmt* _tmp21_;
+		gint _tmp22_ = 0;
+		gint depth;
+		sqlite3_stmt* _tmp23_;
+		gint _tmp24_ = 0;
+		gint n_channels;
+		sqlite3_stmt* _tmp25_;
+		gint _tmp26_ = 0;
+		ScanDirection scan_direction;
+		gboolean _tmp27_ = FALSE;
+		gint _tmp28_;
+		gboolean _tmp30_;
+		gint _tmp31_;
+		gchar* _tmp32_ = NULL;
+		gchar* _tmp33_;
+		gint _tmp34_;
+		gchar* _tmp35_ = NULL;
+		gchar* _tmp36_;
+		gchar* _tmp37_ = NULL;
+		gchar* _tmp38_;
+		Book* _tmp39_;
+		gint _tmp40_;
+		gint _tmp41_;
+		gint _tmp42_;
+		ScanDirection _tmp43_;
+		Page* _tmp44_ = NULL;
+		Page* new_page;
+		gboolean _tmp45_ = FALSE;
+		gint _tmp46_;
+		gboolean _tmp48_;
+		Page* _tmp64_;
+		sqlite3_stmt* _tmp65_;
+		const gchar* _tmp66_ = NULL;
+		sqlite3_stmt* _tmp67_;
+		gint _tmp68_ = 0;
+		gint crop_x;
+		sqlite3_stmt* _tmp69_;
+		gint _tmp70_ = 0;
+		gint crop_y;
+		sqlite3_stmt* _tmp71_;
+		gint _tmp72_ = 0;
+		gint crop_width;
+		sqlite3_stmt* _tmp73_;
+		gint _tmp74_ = 0;
+		gint crop_height;
+		gboolean _tmp75_ = FALSE;
+		gint _tmp76_;
+		gboolean _tmp78_;
+		sqlite3_stmt* _tmp85_;
+		gint _tmp86_ = 0;
+		guchar* _tmp87_ = NULL;
+		guchar* new_pixels;
+		gint new_pixels_length1;
+		gint _new_pixels_size_;
+		guchar* _tmp88_;
+		gint _tmp88__length1;
+		sqlite3_stmt* _tmp89_;
+		void* _tmp90_ = NULL;
+		sqlite3_stmt* _tmp91_;
+		gint _tmp92_ = 0;
+		Page* _tmp93_;
+		guchar* _tmp94_;
+		gint _tmp94__length1;
+		sqlite3_stmt* _tmp95_;
+		gint _tmp96_ = 0;
+		gint id;
+		gint _tmp97_;
+		gchar* _tmp98_ = NULL;
+		gchar* _tmp99_;
+		gchar* _tmp100_ = NULL;
+		sqlite3_stmt* stmt2 = NULL;
+		sqlite3* _tmp101_;
+		const gchar* _tmp102_;
+		sqlite3_stmt* _tmp103_ = NULL;
+		gint _tmp104_ = 0;
+		gint result2;
+		gint _tmp105_;
+		sqlite3_stmt* _tmp111_;
+		GHashFunc _tmp112_;
+		Page* _tmp113_;
+		guint _tmp114_ = 0U;
+		sqlite3_stmt* _tmp115_;
+		GHashFunc _tmp116_;
+		Book* _tmp117_;
+		guint _tmp118_ = 0U;
+		sqlite3_stmt* _tmp119_;
+		gint _tmp120_;
+		sqlite3_stmt* _tmp121_;
+		gint _tmp122_ = 0;
+		gint _tmp123_;
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp11_ = stmt;
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp12_ = sqlite3_step (_tmp11_);
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		if (!(SQLITE_ROW == _tmp12_)) {
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			break;
+#line 2379 "autosave-manager.c"
+		}
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_debug ("autosave-manager.vala:481: Found a page that needs to be recovered");
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp13_ = first;
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		if (_tmp13_) {
+#line 2387 "autosave-manager.c"
+			Book* _tmp14_;
+#line 484 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp14_ = *book;
+#line 484 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			book_clear (_tmp14_);
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			first = FALSE;
+#line 2395 "autosave-manager.c"
+		}
+#line 487 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp15_ = stmt;
+#line 487 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp16_ = sqlite3_column_int (_tmp15_, 5);
+#line 487 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		dpi = _tmp16_;
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp17_ = stmt;
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp18_ = sqlite3_column_int (_tmp17_, 6);
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		width = _tmp18_;
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp19_ = stmt;
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp20_ = sqlite3_column_int (_tmp19_, 7);
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		height = _tmp20_;
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp21_ = stmt;
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp22_ = sqlite3_column_int (_tmp21_, 8);
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		depth = _tmp22_;
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp23_ = stmt;
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp24_ = sqlite3_column_int (_tmp23_, 9);
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		n_channels = _tmp24_;
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp25_ = stmt;
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp26_ = sqlite3_column_int (_tmp25_, 16);
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		scan_direction = (ScanDirection) _tmp26_;
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp28_ = width;
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		if (_tmp28_ <= 0) {
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp27_ = TRUE;
+#line 2439 "autosave-manager.c"
+		} else {
+			gint _tmp29_;
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp29_ = height;
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp27_ = _tmp29_ <= 0;
+#line 2446 "autosave-manager.c"
+		}
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp30_ = _tmp27_;
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		if (_tmp30_) {
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			continue;
+#line 2454 "autosave-manager.c"
+		}
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp31_ = width;
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp32_ = g_strdup_printf ("%i", _tmp31_);
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp33_ = _tmp32_;
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp34_ = height;
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp35_ = g_strdup_printf ("%i", _tmp34_);
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp36_ = _tmp35_;
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp37_ = g_strconcat ("Restoring a page of size ", _tmp33_, " x ", _tmp36_, NULL);
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp38_ = _tmp37_;
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_debug ("autosave-manager.vala:497: %s", _tmp38_);
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_free0 (_tmp38_);
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_free0 (_tmp36_);
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_free0 (_tmp33_);
+#line 498 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp39_ = *book;
+#line 498 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp40_ = width;
+#line 498 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp41_ = height;
+#line 498 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp42_ = dpi;
+#line 498 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp43_ = scan_direction;
+#line 498 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp44_ = book_append_page (_tmp39_, _tmp40_, _tmp41_, _tmp42_, _tmp43_);
+#line 498 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		new_page = _tmp44_;
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp46_ = depth;
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		if (_tmp46_ > 0) {
+#line 2498 "autosave-manager.c"
+			gint _tmp47_;
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp47_ = n_channels;
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp45_ = _tmp47_ > 0;
+#line 2504 "autosave-manager.c"
+		} else {
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp45_ = FALSE;
+#line 2508 "autosave-manager.c"
+		}
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp48_ = _tmp45_;
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		if (_tmp48_) {
+#line 2514 "autosave-manager.c"
+			ScanPageInfo* _tmp49_;
+			ScanPageInfo* info;
+			ScanPageInfo* _tmp50_;
+			gint _tmp51_;
+			ScanPageInfo* _tmp52_;
+			gint _tmp53_;
+			ScanPageInfo* _tmp54_;
+			gint _tmp55_;
+			ScanPageInfo* _tmp56_;
+			gint _tmp57_;
+			ScanPageInfo* _tmp58_;
+			gint _tmp59_;
+			ScanPageInfo* _tmp60_;
+			gchar* _tmp61_;
+			Page* _tmp62_;
+			ScanPageInfo* _tmp63_;
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp49_ = scan_page_info_new ();
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			info = _tmp49_;
+#line 503 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp50_ = info;
+#line 503 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp51_ = width;
+#line 503 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp50_->width = _tmp51_;
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp52_ = info;
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp53_ = height;
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp52_->height = _tmp53_;
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp54_ = info;
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp55_ = depth;
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp54_->depth = _tmp55_;
+#line 506 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp56_ = info;
+#line 506 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp57_ = n_channels;
+#line 506 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp56_->n_channels = _tmp57_;
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp58_ = info;
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp59_ = dpi;
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp58_->dpi = (gdouble) _tmp59_;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp60_ = info;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp61_ = g_strdup ("");
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_g_free0 (_tmp60_->device);
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp60_->device = _tmp61_;
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp62_ = new_page;
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp63_ = info;
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			page_set_page_info (_tmp62_, _tmp63_);
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_scan_page_info_unref0 (info);
+#line 2581 "autosave-manager.c"
+		}
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp64_ = new_page;
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp65_ = stmt;
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp66_ = sqlite3_column_text (_tmp65_, 11);
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		page_set_color_profile (_tmp64_, _tmp66_);
+#line 513 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp67_ = stmt;
+#line 513 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp68_ = sqlite3_column_int (_tmp67_, 12);
+#line 513 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		crop_x = _tmp68_;
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp69_ = stmt;
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp70_ = sqlite3_column_int (_tmp69_, 13);
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		crop_y = _tmp70_;
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp71_ = stmt;
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp72_ = sqlite3_column_int (_tmp71_, 14);
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		crop_width = _tmp72_;
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp73_ = stmt;
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp74_ = sqlite3_column_int (_tmp73_, 15);
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		crop_height = _tmp74_;
+#line 517 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp76_ = crop_width;
+#line 517 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		if (_tmp76_ > 0) {
+#line 2619 "autosave-manager.c"
+			gint _tmp77_;
+#line 517 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp77_ = crop_height;
+#line 517 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp75_ = _tmp77_ > 0;
+#line 2625 "autosave-manager.c"
+		} else {
+#line 517 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp75_ = FALSE;
+#line 2629 "autosave-manager.c"
+		}
+#line 517 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp78_ = _tmp75_;
+#line 517 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		if (_tmp78_) {
+#line 2635 "autosave-manager.c"
+			Page* _tmp79_;
+			gint _tmp80_;
+			gint _tmp81_;
+			Page* _tmp82_;
+			gint _tmp83_;
+			gint _tmp84_;
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp79_ = new_page;
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp80_ = crop_width;
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp81_ = crop_height;
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			page_set_custom_crop (_tmp79_, _tmp80_, _tmp81_);
+#line 520 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp82_ = new_page;
+#line 520 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp83_ = crop_x;
+#line 520 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp84_ = crop_y;
+#line 520 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			page_move_crop (_tmp82_, _tmp83_, _tmp84_);
+#line 2658 "autosave-manager.c"
+		}
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp85_ = stmt;
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp86_ = sqlite3_column_bytes (_tmp85_, 17);
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp87_ = g_new0 (guchar, _tmp86_);
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		new_pixels = _tmp87_;
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		new_pixels_length1 = _tmp86_;
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_new_pixels_size_ = new_pixels_length1;
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp88_ = new_pixels;
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp88__length1 = new_pixels_length1;
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp89_ = stmt;
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp90_ = sqlite3_column_blob (_tmp89_, 17);
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp91_ = stmt;
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp92_ = sqlite3_column_bytes (_tmp91_, 17);
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		memcpy (_tmp88_, _tmp90_, (gsize) _tmp92_);
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp93_ = new_page;
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp94_ = new_pixels;
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp94__length1 = new_pixels_length1;
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		page_set_pixels (_tmp93_, _tmp94_, _tmp94__length1);
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp95_ = stmt;
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp96_ = sqlite3_column_int (_tmp95_, 18);
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		id = _tmp96_;
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_debug ("autosave-manager.vala:528: Updating autosave to point to our new copy " \
+"of the page");
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp97_ = id;
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp98_ = g_strdup_printf ("%i", _tmp97_);
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp99_ = _tmp98_;
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp100_ = g_strconcat ("\n" \
+"                UPDATE pages\n" \
+"                   SET page_hash=?1,\n" \
+"                       book_hash=?2,\n" \
+"                       book_revision=?3\n" \
+"                WHERE id = ", _tmp99_, "\n            ", NULL);
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_free0 (query);
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		query = _tmp100_;
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_free0 (_tmp99_);
+#line 538 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp101_ = self->priv->database_connection;
+#line 538 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp102_ = query;
+#line 538 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp104_ = sqlite3_prepare_v2 (_tmp101_, _tmp102_, -1, &_tmp103_, NULL);
+#line 538 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_sqlite3_finalize0 (stmt2);
+#line 538 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		stmt2 = _tmp103_;
+#line 538 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		result2 = _tmp104_;
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp105_ = result2;
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		if (_tmp105_ != SQLITE_OK) {
+#line 2732 "autosave-manager.c"
+			gint _tmp106_;
+			gchar* _tmp107_ = NULL;
+			gchar* _tmp108_;
+			gchar* _tmp109_ = NULL;
+			gchar* _tmp110_;
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp106_ = result2;
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp107_ = g_strdup_printf ("%i", _tmp106_);
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp108_ = _tmp107_;
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp109_ = g_strconcat ("Error ", _tmp108_, " while preparing query", NULL);
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp110_ = _tmp109_;
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			g_warning ("autosave-manager.vala:540: %s", _tmp110_);
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_g_free0 (_tmp110_);
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_g_free0 (_tmp108_);
+#line 2754 "autosave-manager.c"
+		}
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp111_ = stmt2;
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp112_ = g_direct_hash;
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp113_ = new_page;
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp114_ = _tmp112_ (_tmp113_);
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		sqlite3_bind_int64 (_tmp111_, 1, (gint64) _tmp114_);
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp115_ = stmt2;
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp116_ = g_direct_hash;
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp117_ = *book;
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp118_ = _tmp116_ (_tmp117_);
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		sqlite3_bind_int64 (_tmp115_, 2, (gint64) _tmp118_);
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp119_ = stmt2;
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp120_ = self->priv->cur_book_revision;
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		sqlite3_bind_int64 (_tmp119_, 3, (gint64) _tmp120_);
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp121_ = stmt2;
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp122_ = sqlite3_step (_tmp121_);
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		result2 = _tmp122_;
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp123_ = result2;
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		if (_tmp123_ != SQLITE_DONE) {
+#line 2792 "autosave-manager.c"
+			gint _tmp124_;
+#line 547 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp124_ = _result_;
+#line 547 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			g_warning ("autosave-manager.vala:547: Error %d while executing query", _tmp124_);
+#line 2798 "autosave-manager.c"
+		}
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_sqlite3_finalize0 (stmt2);
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		new_pixels = (g_free (new_pixels), NULL);
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_page_unref0 (new_page);
+#line 2806 "autosave-manager.c"
+	}
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp125_ = first;
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	if (_tmp125_) {
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_debug ("autosave-manager.vala:551: No pages found to recover");
+#line 2814 "autosave-manager.c"
+	}
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_g_free0 (query);
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_sqlite3_finalize0 (stmt);
+#line 2820 "autosave-manager.c"
+}
+
+
+Book* autosave_manager_get_book (AutosaveManager* self) {
+	Book* result;
+	Book* _tmp0_;
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_val_if_fail (self != NULL, NULL);
+#line 56 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp0_ = self->priv->_book;
+#line 56 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	result = _tmp0_;
+#line 56 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	return result;
+#line 2835 "autosave-manager.c"
+}
+
+
+static void _autosave_manager_on_page_added_book_page_added (Book* _sender, Page* page, gpointer self) {
+#line 67 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	autosave_manager_on_page_added (self, page);
+#line 2842 "autosave-manager.c"
+}
+
+
+static void _autosave_manager_on_page_removed_book_page_removed (Book* _sender, Page* page, gpointer self) {
+#line 68 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	autosave_manager_on_page_removed (self, page);
+#line 2849 "autosave-manager.c"
+}
+
+
+static void _autosave_manager_on_reordered_book_reordered (Book* _sender, gpointer self) {
+#line 69 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	autosave_manager_on_reordered (self);
+#line 2856 "autosave-manager.c"
+}
+
+
+static void _autosave_manager_on_cleared_book_cleared (Book* _sender, gpointer self) {
+#line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	autosave_manager_on_cleared (self);
+#line 2863 "autosave-manager.c"
+}
+
+
+static gpointer _book_ref0 (gpointer self) {
+#line 72 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	return self ? book_ref (self) : NULL;
+#line 2870 "autosave-manager.c"
+}
+
+
+void autosave_manager_set_book (AutosaveManager* self, Book* value) {
+	Book* _tmp0_;
+	Book* _tmp19_;
+	Book* _tmp20_;
+	Book* _tmp21_;
+	Book* _tmp22_;
+	Book* _tmp23_;
+	Book* _tmp24_;
+#line 58 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_if_fail (self != NULL);
+#line 60 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp0_ = self->priv->_book;
+#line 60 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	if (_tmp0_ != NULL) {
+#line 2888 "autosave-manager.c"
+		Book* _tmp11_;
+		guint _tmp12_ = 0U;
+		Book* _tmp13_;
+		guint _tmp14_ = 0U;
+		Book* _tmp15_;
+		guint _tmp16_ = 0U;
+		Book* _tmp17_;
+		guint _tmp18_ = 0U;
+		{
+			gint i;
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			i = 0;
+#line 2901 "autosave-manager.c"
+			{
+				gboolean _tmp1_;
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp1_ = TRUE;
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				while (TRUE) {
+#line 2908 "autosave-manager.c"
+					gboolean _tmp2_;
+					gint _tmp4_;
+					Book* _tmp5_;
+					guint _tmp6_ = 0U;
+					Book* _tmp7_;
+					gint _tmp8_;
+					Page* _tmp9_ = NULL;
+					Page* page;
+					Page* _tmp10_;
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp2_ = _tmp1_;
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					if (!_tmp2_) {
+#line 2922 "autosave-manager.c"
+						gint _tmp3_;
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						_tmp3_ = i;
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						i = _tmp3_ + 1;
+#line 2928 "autosave-manager.c"
+					}
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp1_ = FALSE;
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp4_ = i;
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp5_ = self->priv->_book;
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp6_ = book_get_n_pages (_tmp5_);
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					if (!(((guint) _tmp4_) < _tmp6_)) {
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						break;
+#line 2942 "autosave-manager.c"
+					}
+#line 64 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp7_ = self->priv->_book;
+#line 64 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp8_ = i;
+#line 64 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp9_ = book_get_page (_tmp7_, _tmp8_);
+#line 64 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					page = _tmp9_;
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp10_ = page;
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					autosave_manager_on_page_removed (self, _tmp10_);
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_page_unref0 (page);
+#line 2958 "autosave-manager.c"
+				}
+			}
+		}
+#line 67 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp11_ = self->priv->_book;
+#line 67 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_signal_parse_name ("page-added", TYPE_BOOK, &_tmp12_, NULL, FALSE);
+#line 67 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_signal_handlers_disconnect_matched (_tmp11_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _autosave_manager_on_page_added_book_page_added, self);
+#line 68 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp13_ = self->priv->_book;
+#line 68 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_signal_parse_name ("page-removed", TYPE_BOOK, &_tmp14_, NULL, FALSE);
+#line 68 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_signal_handlers_disconnect_matched (_tmp13_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _autosave_manager_on_page_removed_book_page_removed, self);
+#line 69 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp15_ = self->priv->_book;
+#line 69 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_signal_parse_name ("reordered", TYPE_BOOK, &_tmp16_, NULL, FALSE);
+#line 69 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_signal_handlers_disconnect_matched (_tmp15_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) _autosave_manager_on_reordered_book_reordered, self);
+#line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp17_ = self->priv->_book;
+#line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_signal_parse_name ("cleared", TYPE_BOOK, &_tmp18_, NULL, FALSE);
+#line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_signal_handlers_disconnect_matched (_tmp17_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp18_, 0, NULL, (GCallback) _autosave_manager_on_cleared_book_cleared, self);
+#line 2986 "autosave-manager.c"
+	}
+#line 72 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp19_ = value;
+#line 72 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp20_ = _book_ref0 (_tmp19_);
+#line 72 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_book_unref0 (self->priv->_book);
+#line 72 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	self->priv->_book = _tmp20_;
+#line 73 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp21_ = self->priv->_book;
+#line 73 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_signal_connect (_tmp21_, "page-added", (GCallback) _autosave_manager_on_page_added_book_page_added, self);
+#line 74 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp22_ = self->priv->_book;
+#line 74 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_signal_connect (_tmp22_, "page-removed", (GCallback) _autosave_manager_on_page_removed_book_page_removed, self);
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp23_ = self->priv->_book;
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_signal_connect (_tmp23_, "reordered", (GCallback) _autosave_manager_on_reordered_book_reordered, self);
+#line 76 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp24_ = self->priv->_book;
+#line 76 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_signal_connect (_tmp24_, "cleared", (GCallback) _autosave_manager_on_cleared_book_cleared, self);
+#line 3012 "autosave-manager.c"
+	{
+		gint i;
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		i = 0;
+#line 3017 "autosave-manager.c"
+		{
+			gboolean _tmp25_;
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp25_ = TRUE;
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			while (TRUE) {
+#line 3024 "autosave-manager.c"
+				gboolean _tmp26_;
+				gint _tmp28_;
+				Book* _tmp29_;
+				guint _tmp30_ = 0U;
+				Book* _tmp31_;
+				Book* _tmp32_;
+				gint _tmp33_;
+				Page* _tmp34_ = NULL;
+				Page* page;
+				Page* _tmp35_;
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp26_ = _tmp25_;
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				if (!_tmp26_) {
+#line 3039 "autosave-manager.c"
+					gint _tmp27_;
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp27_ = i;
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					i = _tmp27_ + 1;
+#line 3045 "autosave-manager.c"
+				}
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp25_ = FALSE;
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp28_ = i;
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp29_ = self->priv->_book;
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp30_ = book_get_n_pages (_tmp29_);
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				if (!(((guint) _tmp28_) < _tmp30_)) {
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					break;
+#line 3059 "autosave-manager.c"
+				}
+#line 79 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp31_ = autosave_manager_get_book (self);
+#line 79 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp32_ = _tmp31_;
+#line 79 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp33_ = i;
+#line 79 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp34_ = book_get_page (_tmp32_, _tmp33_);
+#line 79 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				page = _tmp34_;
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp35_ = page;
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				autosave_manager_on_page_added (self, _tmp35_);
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_page_unref0 (page);
+#line 3077 "autosave-manager.c"
+			}
+		}
+	}
+}
+
+
+static void value_autosave_manager_init (GValue* value) {
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	value->data[0].v_pointer = NULL;
+#line 3087 "autosave-manager.c"
+}
+
+
+static void value_autosave_manager_free_value (GValue* value) {
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	if (value->data[0].v_pointer) {
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		autosave_manager_unref (value->data[0].v_pointer);
+#line 3096 "autosave-manager.c"
+	}
+}
+
+
+static void value_autosave_manager_copy_value (const GValue* src_value, GValue* dest_value) {
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	if (src_value->data[0].v_pointer) {
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		dest_value->data[0].v_pointer = autosave_manager_ref (src_value->data[0].v_pointer);
+#line 3106 "autosave-manager.c"
+	} else {
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		dest_value->data[0].v_pointer = NULL;
+#line 3110 "autosave-manager.c"
+	}
+}
+
+
+static gpointer value_autosave_manager_peek_pointer (const GValue* value) {
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	return value->data[0].v_pointer;
+#line 3118 "autosave-manager.c"
+}
+
+
+static gchar* value_autosave_manager_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	if (collect_values[0].v_pointer) {
+#line 3125 "autosave-manager.c"
+		AutosaveManager* object;
+		object = collect_values[0].v_pointer;
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		if (object->parent_instance.g_class == NULL) {
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+#line 3132 "autosave-manager.c"
+		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+#line 3136 "autosave-manager.c"
+		}
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		value->data[0].v_pointer = autosave_manager_ref (object);
+#line 3140 "autosave-manager.c"
+	} else {
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		value->data[0].v_pointer = NULL;
+#line 3144 "autosave-manager.c"
+	}
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	return NULL;
+#line 3148 "autosave-manager.c"
+}
+
+
+static gchar* value_autosave_manager_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+	AutosaveManager** object_p;
+	object_p = collect_values[0].v_pointer;
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	if (!object_p) {
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
+#line 3159 "autosave-manager.c"
+	}
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	if (!value->data[0].v_pointer) {
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		*object_p = NULL;
+#line 3165 "autosave-manager.c"
+	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		*object_p = value->data[0].v_pointer;
+#line 3169 "autosave-manager.c"
+	} else {
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		*object_p = autosave_manager_ref (value->data[0].v_pointer);
+#line 3173 "autosave-manager.c"
+	}
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	return NULL;
+#line 3177 "autosave-manager.c"
+}
+
+
+GParamSpec* param_spec_autosave_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+	ParamSpecAutosaveManager* spec;
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_val_if_fail (g_type_is_a (object_type, TYPE_AUTOSAVE_MANAGER), NULL);
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	G_PARAM_SPEC (spec)->value_type = object_type;
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	return G_PARAM_SPEC (spec);
+#line 3191 "autosave-manager.c"
+}
+
+
+gpointer value_get_autosave_manager (const GValue* value) {
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AUTOSAVE_MANAGER), NULL);
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	return value->data[0].v_pointer;
+#line 3200 "autosave-manager.c"
+}
+
+
+void value_set_autosave_manager (GValue* value, gpointer v_object) {
+	AutosaveManager* old;
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AUTOSAVE_MANAGER));
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	old = value->data[0].v_pointer;
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	if (v_object) {
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_AUTOSAVE_MANAGER));
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		value->data[0].v_pointer = v_object;
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		autosave_manager_ref (value->data[0].v_pointer);
+#line 3220 "autosave-manager.c"
+	} else {
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		value->data[0].v_pointer = NULL;
+#line 3224 "autosave-manager.c"
+	}
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	if (old) {
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		autosave_manager_unref (old);
+#line 3230 "autosave-manager.c"
+	}
+}
+
+
+void value_take_autosave_manager (GValue* value, gpointer v_object) {
+	AutosaveManager* old;
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AUTOSAVE_MANAGER));
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	old = value->data[0].v_pointer;
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	if (v_object) {
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_AUTOSAVE_MANAGER));
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		value->data[0].v_pointer = v_object;
+#line 3249 "autosave-manager.c"
+	} else {
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		value->data[0].v_pointer = NULL;
+#line 3253 "autosave-manager.c"
+	}
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	if (old) {
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		autosave_manager_unref (old);
+#line 3259 "autosave-manager.c"
+	}
+}
+
+
+static void autosave_manager_class_init (AutosaveManagerClass * klass) {
+	const gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	const gchar* _tmp4_;
+	const gchar* _tmp5_;
+	const gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_ = NULL;
+	pid_t _tmp10_ = 0;
+	gchar* _tmp11_ = NULL;
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	autosave_manager_parent_class = g_type_class_peek_parent (klass);
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	AUTOSAVE_MANAGER_CLASS (klass)->finalize = autosave_manager_finalize;
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_type_class_add_private (klass, sizeof (AutosaveManagerPrivate));
+#line 38 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp0_ = g_get_user_cache_dir ();
+#line 38 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp1_ = g_build_filename (_tmp0_, "simple-scan", "autosaves", NULL);
+#line 38 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	autosave_manager_AUTOSAVE_DIR = _tmp1_;
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp2_ = g_strdup ("autosaves");
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	autosave_manager_AUTOSAVE_NAME = _tmp2_;
+#line 40 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp3_ = g_strdup (".db");
+#line 40 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	autosave_manager_AUTOSAVE_EXT = _tmp3_;
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp4_ = autosave_manager_AUTOSAVE_DIR;
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp5_ = autosave_manager_AUTOSAVE_NAME;
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp6_ = autosave_manager_AUTOSAVE_EXT;
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp7_ = g_strconcat (_tmp5_, _tmp6_, NULL);
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp8_ = _tmp7_;
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp9_ = g_build_filename (_tmp4_, _tmp8_, NULL);
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	autosave_manager_AUTOSAVE_FILENAME = _tmp9_;
+#line 43 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp10_ = getpid ();
+#line 43 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp11_ = g_strdup_printf ("%i", (gint) _tmp10_);
+#line 43 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	autosave_manager_PID = _tmp11_;
+#line 3317 "autosave-manager.c"
+}
+
+
+static void autosave_manager_instance_init (AutosaveManager * self) {
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	self->priv = AUTOSAVE_MANAGER_GET_PRIVATE (self);
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	self->priv->_book = NULL;
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	self->priv->update_timeout = (guint) 0;
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	self->priv->cur_book_revision = 0;
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	self->ref_count = 1;
+#line 3332 "autosave-manager.c"
+}
+
+
+static void autosave_manager_finalize (AutosaveManager* obj) {
+	AutosaveManager * self;
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_AUTOSAVE_MANAGER, AutosaveManager);
+#line 46 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_sqlite3_close0 (self->priv->database_connection);
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_book_unref0 (self->priv->_book);
+#line 50 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_g_hash_table_unref0 (self->priv->dirty_pages);
+#line 3346 "autosave-manager.c"
+}
+
+
+GType autosave_manager_get_type (void) {
+	static volatile gsize autosave_manager_type_id__volatile = 0;
+	if (g_once_init_enter (&autosave_manager_type_id__volatile)) {
+		static const GTypeValueTable g_define_type_value_table = { value_autosave_manager_init, value_autosave_manager_free_value, value_autosave_manager_copy_value, value_autosave_manager_peek_pointer, "p", value_autosave_manager_collect_value, "p", value_autosave_manager_lcopy_value };
+		static const GTypeInfo g_define_type_info = { sizeof (AutosaveManagerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) autosave_manager_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (AutosaveManager), 0, (GInstanceInitFunc) autosave_manager_instance_init, &g_define_type_value_table };
+		static const GTypeFundamentalInfo g_define_type_fundamental_info = { (G_TYPE_FLAG_CLASSED | G_TYPE_FLAG_INSTANTIATABLE | G_TYPE_FLAG_DERIVABLE | G_TYPE_FLAG_DEEP_DERIVABLE) };
+		GType autosave_manager_type_id;
+		autosave_manager_type_id = g_type_register_fundamental (g_type_fundamental_next (), "AutosaveManager", &g_define_type_info, &g_define_type_fundamental_info, 0);
+		g_once_init_leave (&autosave_manager_type_id__volatile, autosave_manager_type_id);
+	}
+	return autosave_manager_type_id__volatile;
+}
+
+
+gpointer autosave_manager_ref (gpointer instance) {
+	AutosaveManager* self;
+	self = instance;
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_atomic_int_inc (&self->ref_count);
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	return instance;
+#line 3371 "autosave-manager.c"
+}
+
+
+void autosave_manager_unref (gpointer instance) {
+	AutosaveManager* self;
+	self = instance;
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	if (g_atomic_int_dec_and_test (&self->ref_count)) {
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		AUTOSAVE_MANAGER_GET_CLASS (self)->finalize (self);
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_type_free_instance ((GTypeInstance *) self);
+#line 3384 "autosave-manager.c"
+	}
+}
+
+
+
diff --git a/src/autosave-manager.vala b/src/autosave-manager.vala
new file mode 100644
index 0000000..eb8f1c5
--- /dev/null
+++ b/src/autosave-manager.vala
@@ -0,0 +1,553 @@
+/*
+ * Copyright (C) 2011 Timo Kluck
+ * Author: Timo Kluck <tkluck@infty.nl>
+ *
+ * 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 3 of the License, or (at your option) any later
+ * version. See http://www.gnu.org/copyleft/gpl.html the full text of the
+ * license.
+ */
+
+/*
+ * We store autosaves in a database named
+ *    ~/.cache/simple-scan/autosaves/autosaves.db
+ * It contains a single table of pages, each containing the process id (pid) of
+ * the simple-scan instance that saved it, and a hash of the Book and Page
+ * objects corresponding to it. The pixels are saved as a BLOB.
+ * Additionally, the autosaves directory contains a number of tiff files that
+ * the user can use for manual recovery.
+ *
+ * At startup, we check whether autosaves.db contains any records
+ * with a pid that does not match a current pid for simple-scan. If so, we take
+ * ownership by an UPDATE statement changing to our own pid. Then, we
+ * recover the book. We're trying our best to avoid the possible race
+ * condition if several instances of simple-scan are started simultaneously.
+ *
+ * At application exit, we delete the records corresponding to our own pid.
+ *
+ * Important notes:
+ *  - We enforce that there is only one AutosaveManager instance in a given
+ *    process by using a create function.
+ *  - It should be possible to change the book object at runtime, although this
+ *    is not used in the current implementation so it has not been tested.
+ */
+
+public class AutosaveManager
+{
+    private static string AUTOSAVE_DIR = Path.build_filename (Environment.get_user_cache_dir (), "simple-scan", "autosaves");
+    private static string AUTOSAVE_NAME = "autosaves";
+    private static string AUTOSAVE_EXT = ".db";
+    private static string AUTOSAVE_FILENAME = Path.build_filename (AUTOSAVE_DIR, AUTOSAVE_NAME + AUTOSAVE_EXT);
+
+    private static string PID = ((int)(Posix.getpid ())).to_string ();
+    private static int number_of_instances = 0;
+
+    private Sqlite.Database database_connection;
+    private Book _book = null;
+
+    private uint update_timeout = 0;
+    private HashTable<Page, bool> dirty_pages;
+
+    public Book book
+    {
+        get
+        {
+            return _book;
+        }
+        set
+        {
+            if (_book != null)
+            {
+                for (var i = 0; i < _book.get_n_pages (); i++)
+                {
+                    var page = _book.get_page (i);
+                    on_page_removed (page);
+                }
+                _book.page_added.disconnect (on_page_added);
+                _book.page_removed.disconnect (on_page_removed);
+                _book.reordered.disconnect (on_reordered);
+                _book.cleared.disconnect (on_cleared);
+            }
+            _book = value;
+            _book.page_added.connect (on_page_added);
+            _book.page_removed.connect (on_page_removed);
+            _book.reordered.connect (on_reordered);
+            _book.cleared.connect (on_cleared);
+            for (var i = 0; i < _book.get_n_pages (); i++)
+            {
+                var page = book.get_page (i);
+                on_page_added (page);
+            }
+        }
+    }
+
+    public static AutosaveManager? create (ref Book book)
+    {
+        /* compare autosave directories with pids of current instances of simple-scan
+         * take ownership of one of the ones that are unowned by renaming to the
+         * own pid. Then open the database and fill the book with the pages it
+         * contains.
+         */
+        if (number_of_instances > 0)
+            assert_not_reached ();
+
+        var man = new AutosaveManager ();
+        number_of_instances++;
+
+        try
+        {
+            man.database_connection = open_database_connection ();
+        }
+        catch
+        {
+            warning ("Could not connect to the autosave database; no autosaves will be kept.");
+            return null;
+        }
+
+        bool any_pages_recovered = false;
+        try
+        {
+            // FIXME: this only works on linux. We can maybe use Gtk.Application and some session bus id instead?
+            string current_pids;
+            Process.spawn_command_line_sync ("pidof simple-scan | sed \"s/ /,/g\"", out current_pids);
+            current_pids = current_pids.strip ();
+            Sqlite.Statement stmt;
+            string query = @"
+                   SELECT process_id, book_hash, book_revision FROM pages
+                   WHERE NOT process_id IN ($current_pids)
+                   LIMIT 1
+                ";
+
+            var result = man.database_connection.prepare_v2 (query, -1, out stmt);
+            if (result == Sqlite.OK)
+            {
+                while (stmt.step () == Sqlite.ROW)
+                {
+                    debug ("Found at least one autosave page, taking ownership");
+                    var unowned_pid = stmt.column_int (0);
+                    var book_hash = stmt.column_int (1);
+                    var book_revision = stmt.column_int (2);
+                    /* there's a possible race condition here when several instances
+                     * try to take ownership of the same rows. What would happen is
+                     * that this operations would affect no rows if another process
+                     * has taken ownership in the mean time. In that case, recover_book
+                     * does nothing, so there should be no problem.
+                     */
+                    query = @"
+                        UPDATE pages
+                           SET process_id = $PID
+                         WHERE process_id = ?2
+                           AND book_hash = ?3
+                           AND book_revision = ?4";
+                    Sqlite.Statement stmt2;
+                    result = man.database_connection.prepare_v2(query, -1, out stmt2);
+                    if (result != Sqlite.OK)
+                        warning (@"Error preparing statement: $query");
+
+                    stmt2.bind_int64 (2, unowned_pid);
+                    stmt2.bind_int64 (3, book_hash);
+                    stmt2.bind_int64 (4, book_revision);
+                    result = stmt2.step();
+                    if (result == Sqlite.DONE)
+                    {
+                        any_pages_recovered = true;
+                        man.recover_book (ref book);
+                    }
+                    else
+                        warning ("Error %d while executing query", result);
+                }
+            }
+            else
+                warning ("Error %d while preparing statement", result);
+        }
+        catch (SpawnError e)
+        {
+            warning ("Could not obtain current process ids; not restoring any autosaves");
+        }
+
+        man.book = book;
+        if (!any_pages_recovered)
+        {
+            for (var i = 0; i < book.get_n_pages (); i++)
+            {
+                var page = book.get_page (i);
+                man.on_page_added (page);
+            }
+        }
+
+        return man;
+    }
+
+    private AutosaveManager ()
+    {
+        dirty_pages = new HashTable<Page, bool> (direct_hash, direct_equal);
+    }
+
+    public void cleanup ()
+    {
+        debug ("Clean exit; deleting autosave records");
+
+        if (update_timeout > 0)
+            Source.remove (update_timeout);
+        update_timeout = 0;
+
+        warn_if_fail (database_connection.exec (@"
+            DELETE FROM pages
+                WHERE process_id = $PID
+        ") == Sqlite.OK);
+    }
+
+    static Sqlite.Database open_database_connection () throws Error
+    {
+        var autosaves_dir = File.new_for_path (AUTOSAVE_DIR);
+        try
+        {
+            autosaves_dir.make_directory_with_parents ();
+        }
+        catch
+        { // the directory already exists
+            // pass
+        }
+        Sqlite.Database connection;
+        if (Sqlite.Database.open (AUTOSAVE_FILENAME, out connection) != Sqlite.OK)
+            throw new IOError.FAILED ("Could not connect to autosave database");
+        string query = @"
+            CREATE TABLE IF NOT EXISTS pages (
+                id integer PRIMARY KEY,
+                process_id integer,
+                page_hash integer,
+                book_hash integer,
+                book_revision integer,
+                page_number integer,
+                dpi integer,
+                width integer,
+                height integer,
+                depth integer,
+                n_channels integer,
+                rowstride integer,
+                color_profile string,
+                crop_x integer,
+                crop_y integer,
+                crop_width integer,
+                crop_height integer,
+                scan_direction integer,
+                pixels binary
+            )";
+        var result = connection.exec(query);
+        if (result != Sqlite.OK)
+            warning ("Error %d while executing query", result);
+        return connection;
+    }
+
+    void on_page_added (Page page)
+    {
+        insert_page (page);
+        // TODO: save a tiff file
+        page.size_changed.connect (on_page_changed);
+        page.scan_direction_changed.connect (on_page_changed);
+        page.crop_changed.connect (on_page_changed);
+        page.scan_finished.connect (on_page_changed);
+    }
+
+    public void on_page_removed (Page page)
+    {
+        page.pixels_changed.disconnect (on_page_changed);
+        page.size_changed.disconnect (on_page_changed);
+        page.scan_direction_changed.disconnect (on_page_changed);
+        page.crop_changed.disconnect (on_page_changed);
+        page.scan_finished.connect (on_page_changed);
+
+        string query = @"
+        DELETE FROM pages
+            WHERE process_id = $PID
+              AND page_hash = ?2
+              AND book_hash = ?3
+              AND book_revision = ?4
+        ";
+        Sqlite.Statement stmt;
+        var result = database_connection.prepare_v2 (query, -1, out stmt);
+        if (result != Sqlite.OK)
+            warning (@"Error $result while preparing query");
+        stmt.bind_int64 (2, direct_hash (page));
+        stmt.bind_int64 (3, direct_hash (book));
+        stmt.bind_int64 (4, cur_book_revision);
+
+        result = stmt.step();
+        if (result != Sqlite.DONE)
+            warning ("Error %d while executing query", result);
+    }
+
+    public void on_reordered ()
+    {
+        for (var i=0; i < book.get_n_pages (); i++)
+        {
+            var page = book.get_page (i);
+            string query = @"
+            UPDATE pages SET page_number = ?5
+            WHERE process_id = $PID
+              AND page_hash = ?2
+              AND book_hash = ?3
+              AND book_revision = ?4
+            ";
+            Sqlite.Statement stmt;
+            var result = database_connection.prepare_v2 (query, -1, out stmt);
+            if (result != Sqlite.OK)
+                warning (@"Error $result while preparing query");
+
+            stmt.bind_int64 (5, i);
+            stmt.bind_int64 (2, direct_hash (page));
+            stmt.bind_int64 (3, direct_hash (book));
+            stmt.bind_int64 (4, cur_book_revision);
+
+            result = stmt.step();
+            if (result != Sqlite.DONE)
+                warning ("Error %d while executing query", result);
+        }
+    }
+
+    public void on_page_changed (Page page)
+    {
+        update_page (page);
+    }
+
+    public void on_needs_saving_changed (Book book)
+    {
+        for (var n = 0; n < book.get_n_pages (); n++)
+        {
+            var page = book.get_page (n);
+            update_page (page);
+        }
+    }
+
+    private int cur_book_revision = 0;
+
+    public void on_cleared ()
+    {
+        cur_book_revision++;
+    }
+
+    private void insert_page (Page page)
+    {
+        debug ("Adding an autosave for a new page");
+        string query = @"
+            INSERT INTO pages
+                (process_id,
+                page_hash,
+                book_hash,
+                book_revision)
+                VALUES
+                ($PID,
+                ?2,
+                ?3,
+                ?4)
+        ";
+        Sqlite.Statement stmt;
+        var result = database_connection.prepare_v2 (query, -1, out stmt);
+        if (result != Sqlite.OK)
+            warning (@"Error $result while preparing query");
+
+        stmt.bind_int64 (2, direct_hash (page));
+        stmt.bind_int64 (3, direct_hash (book));
+        stmt.bind_int64 (4, cur_book_revision);
+
+        result = stmt.step();
+        if (result != Sqlite.DONE)
+            warning ("Error %d while executing query", result);
+
+        update_page (page);
+    }
+
+    private void update_page (Page page)
+    {
+        dirty_pages.insert (page, true);
+        if (update_timeout > 0)
+            Source.remove (update_timeout);
+        update_timeout = Timeout.add (100, () =>
+        {
+            var iter = HashTableIter<Page, bool> (dirty_pages);
+            Page p;
+            bool is_dirty;
+            while (iter.next (out p, out is_dirty))
+                real_update_page (p);
+
+            dirty_pages.remove_all ();
+            update_timeout = 0;
+
+            return false;
+        });
+    }
+
+    private void real_update_page (Page page)
+    {
+        debug ("Updating the autosave for a page");
+
+        int crop_x;
+        int crop_y;
+        int crop_width;
+        int crop_height;
+        page.get_crop (out crop_x, out crop_y, out crop_width, out crop_height);
+
+        Sqlite.Statement stmt;
+        string query = @"
+            UPDATE pages
+                SET
+                page_number=$(book.get_page_index (page)),
+                dpi=$(page.get_dpi ()),
+                width=$(page.get_width ()),
+                height=$(page.get_height ()),
+                depth=$(page.get_depth ()),
+                n_channels=$(page.get_n_channels ()),
+                rowstride=$(page.get_rowstride ()),
+                crop_x=$crop_x,
+                crop_y=$crop_y,
+                crop_width=$crop_width,
+                crop_height=$crop_height,
+                scan_direction=$((int)page.get_scan_direction ()),
+                color_profile=?1,
+                pixels=?2
+                WHERE process_id = $PID
+                  AND page_hash = ?4
+                  AND book_hash = ?5
+                  AND book_revision = ?6
+            ";
+
+        var result = database_connection.prepare_v2 (query, -1, out stmt);
+        if (result != Sqlite.OK)
+        {
+            warning ("Error %d while preparing statement", result);
+            return;
+        }
+
+        stmt.bind_int64 (4, direct_hash (page));
+        stmt.bind_int64 (5, direct_hash (book));
+        stmt.bind_int64 (6, cur_book_revision);
+        result = stmt.bind_text (1, page.get_color_profile () ?? "");
+
+        if (result != Sqlite.OK)
+            warning ("Error %d while binding text", result);
+
+        if (page.get_pixels () != null)
+        {
+            // (-1) is the special value SQLITE_TRANSIENT
+            result = stmt.bind_blob (2, page.get_pixels (), page.get_pixels ().length, (DestroyNotify)(-1));
+            if (result != Sqlite.OK)
+                warning ("Error %d while binding blob", result);
+        }
+        else
+            warn_if_fail (stmt.bind_null (2) == Sqlite.OK);
+
+        warn_if_fail (stmt.step () == Sqlite.DONE);
+    }
+
+    private void recover_book (ref Book book)
+    {
+        Sqlite.Statement stmt;
+        string query = @"
+            SELECT process_id,
+                page_hash,
+                book_hash,
+                book_revision,
+                page_number,
+                dpi,
+                width,
+                height,
+                depth,
+                n_channels,
+                rowstride,
+                color_profile,
+                crop_x,
+                crop_y,
+                crop_width,
+                crop_height,
+                scan_direction,
+                pixels,
+                id
+            FROM pages
+            WHERE process_id = $PID
+              AND book_revision = (
+                  SELECT MAX(book_revision) FROM pages WHERE process_id = $PID
+              )
+            ORDER BY page_number
+        ";
+
+        var result = database_connection.prepare_v2 (query, -1, out stmt);
+        if (result != Sqlite.OK)
+            warning ("Error %d while preparing statement", result);
+
+        var first = true;
+        while (Sqlite.ROW == stmt.step ())
+        {
+            debug ("Found a page that needs to be recovered");
+            if (first)
+            {
+                book.clear ();
+                first = false;
+            }
+            var dpi = stmt.column_int (5);
+            var width = stmt.column_int (6);
+            var height = stmt.column_int (7);
+            var depth = stmt.column_int (8);
+            var n_channels = stmt.column_int (9);
+            var scan_direction = (ScanDirection)stmt.column_int (16);
+
+            if (width <= 0 || height <= 0)
+                continue;
+
+            debug (@"Restoring a page of size $(width) x $(height)");
+            var new_page = book.append_page (width, height, dpi, scan_direction);
+
+            if (depth > 0 && n_channels > 0)
+            {
+                var info = new ScanPageInfo ();
+                info.width = width;
+                info.height = height;
+                info.depth = depth;
+                info.n_channels = n_channels;
+                info.dpi = dpi;
+                info.device = "";
+                new_page.set_page_info (info);
+            }
+
+            new_page.set_color_profile (stmt.column_text (11));
+            var crop_x = stmt.column_int (12);
+            var crop_y = stmt.column_int (13);
+            var crop_width = stmt.column_int (14);
+            var crop_height = stmt.column_int (15);
+            if (crop_width > 0 && crop_height > 0)
+            {
+                new_page.set_custom_crop (crop_width, crop_height);
+                new_page.move_crop (crop_x, crop_y);
+            }
+
+            uchar[] new_pixels = new uchar[stmt.column_bytes (17)];
+            Memory.copy (new_pixels, stmt.column_blob (17), stmt.column_bytes (17));
+            new_page.set_pixels (new_pixels);
+
+            var id = stmt.column_int (18);
+            debug ("Updating autosave to point to our new copy of the page");
+            query = @"
+                UPDATE pages
+                   SET page_hash=?1,
+                       book_hash=?2,
+                       book_revision=?3
+                WHERE id = $id
+            ";
+
+            Sqlite.Statement stmt2;
+            var result2 = database_connection.prepare_v2 (query, -1, out stmt2);
+            if (result2 != Sqlite.OK)
+                warning (@"Error $result2 while preparing query");
+            stmt2.bind_int64 (1, direct_hash (new_page));
+            stmt2.bind_int64 (2, direct_hash (book));
+            stmt2.bind_int64 (3, cur_book_revision);
+
+            result2 = stmt2.step ();
+            if (result2 != Sqlite.DONE)
+                warning ("Error %d while executing query", result);
+        }
+
+        if (first)
+            debug ("No pages found to recover");
+    }
+}
diff --git a/src/book-view.c b/src/book-view.c
index 6bbf359..0169a0a 100644
--- a/src/book-view.c
+++ b/src/book-view.c
@@ -1,4 +1,4 @@
-/* book-view.c generated by valac 0.18.1, the Vala compiler
+/* book-view.c generated by valac 0.20.1, the Vala compiler
  * generated from book-view.vala, do not modify */
 
 /*
@@ -198,103 +198,137 @@ static void book_view_finalize (GObject* obj);
 
 
 static void _book_view_add_cb_book_page_added (Book* _sender, Page* page, gpointer self) {
+#line 90 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_add_cb (self, _sender, page);
+#line 204 "book-view.c"
 }
 
 
 static void _book_view_remove_cb_book_page_removed (Book* _sender, Page* page, gpointer self) {
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_remove_cb (self, _sender, page);
+#line 211 "book-view.c"
 }
 
 
 static void _book_view_reorder_cb_book_reordered (Book* _sender, gpointer self) {
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_reorder_cb (self, _sender);
+#line 218 "book-view.c"
 }
 
 
 static void _book_view_clear_cb_book_cleared (Book* _sender, gpointer self) {
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_clear_cb (self, _sender);
+#line 225 "book-view.c"
 }
 
 
 static gboolean _book_view_configure_cb_gtk_widget_configure_event (GtkWidget* _sender, GdkEventConfigure* event, gpointer self) {
 	gboolean result;
 	result = book_view_configure_cb (self, _sender, event);
+#line 94 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
+#line 234 "book-view.c"
 }
 
 
 static gboolean _book_view_draw_cb_gtk_widget_draw (GtkWidget* _sender, cairo_t* cr, gpointer self) {
 	gboolean result;
 	result = book_view_draw_cb (self, _sender, cr);
+#line 95 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
+#line 243 "book-view.c"
 }
 
 
 static gboolean _book_view_motion_cb_gtk_widget_motion_notify_event (GtkWidget* _sender, GdkEventMotion* event, gpointer self) {
 	gboolean result;
 	result = book_view_motion_cb (self, _sender, event);
+#line 96 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
+#line 252 "book-view.c"
 }
 
 
 static gboolean _book_view_key_cb_gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self) {
 	gboolean result;
 	result = book_view_key_cb (self, _sender, event);
+#line 97 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
+#line 261 "book-view.c"
 }
 
 
 static gboolean _book_view_button_cb_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
 	gboolean result;
 	result = book_view_button_cb (self, _sender, event);
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
+#line 270 "book-view.c"
 }
 
 
 static gboolean _book_view_button_cb_gtk_widget_button_release_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
 	gboolean result;
 	result = book_view_button_cb (self, _sender, event);
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
+#line 279 "book-view.c"
 }
 
 
 static gboolean _book_view_focus_cb_gtk_widget_focus_in_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self) {
 	gboolean result;
 	result = book_view_focus_cb (self, _sender, event);
+#line 100 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
+#line 288 "book-view.c"
 }
 
 
 static gboolean _book_view_focus_cb_gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self) {
 	gboolean result;
 	result = book_view_focus_cb (self, _sender, event);
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
+#line 297 "book-view.c"
 }
 
 
 static void _book_view_scroll_cb_gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
+#line 102 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_scroll_cb (self, _sender);
+#line 304 "book-view.c"
 }
 
 
 static gpointer _book_ref0 (gpointer self) {
+#line 44 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return self ? book_ref (self) : NULL;
+#line 311 "book-view.c"
 }
 
 
 static void _page_unref0_ (gpointer var) {
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	(var == NULL) ? NULL : (var = (page_unref (var), NULL));
+#line 318 "book-view.c"
 }
 
 
 static void _page_view_unref0_ (gpointer var) {
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	(var == NULL) ? NULL : (var = (page_view_unref (var), NULL));
+#line 325 "book-view.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
+#line 72 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return self ? g_object_ref (self) : NULL;
+#line 332 "book-view.c"
 }
 
 
@@ -332,19 +366,31 @@ BookView* book_view_construct (GType object_type, Book* book) {
 	GtkWidget* _tmp40_;
 	GtkAdjustment* _tmp41_;
 	GtkWidget* _tmp42_;
+#line 42 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (book != NULL, NULL);
+#line 42 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self = (BookView*) g_object_new (object_type, NULL);
+#line 44 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = book;
+#line 44 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = _book_ref0 (_tmp0_);
+#line 44 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_book_unref0 (self->priv->book);
+#line 44 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->book = _tmp1_;
+#line 382 "book-view.c"
 	{
 		gint i;
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		i = 0;
+#line 387 "book-view.c"
 		{
 			gboolean _tmp2_;
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp2_ = TRUE;
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			while (TRUE) {
+#line 394 "book-view.c"
 				gboolean _tmp3_;
 				gint _tmp5_;
 				Book* _tmp6_;
@@ -355,104 +401,195 @@ BookView* book_view_construct (GType object_type, Book* book) {
 				Page* page;
 				Book* _tmp11_;
 				Page* _tmp12_;
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp3_ = _tmp2_;
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (!_tmp3_) {
+#line 409 "book-view.c"
 					gint _tmp4_;
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp4_ = i;
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					i = _tmp4_ + 1;
+#line 415 "book-view.c"
 				}
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp2_ = FALSE;
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp5_ = i;
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp6_ = book;
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp7_ = book_get_n_pages (_tmp6_);
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (!(((guint) _tmp5_) < _tmp7_)) {
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					break;
+#line 429 "book-view.c"
 				}
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp8_ = book;
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp9_ = i;
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp10_ = book_get_page (_tmp8_, _tmp9_);
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				page = _tmp10_;
+#line 50 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp11_ = book;
+#line 50 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp12_ = page;
+#line 50 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				book_view_add_cb (self, _tmp11_, _tmp12_);
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_unref0 (page);
+#line 447 "book-view.c"
 			}
 		}
 	}
+#line 53 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp13_ = book;
+#line 53 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp14_ = book_get_page (_tmp13_, 0);
+#line 53 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp15_ = _tmp14_;
+#line 53 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_select_page (self, _tmp15_);
+#line 53 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_unref0 (_tmp15_);
+#line 56 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp16_ = book;
+#line 56 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (_tmp16_, "page-added", (GCallback) _book_view_add_cb_book_page_added, self, 0);
+#line 57 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp17_ = book;
+#line 57 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (_tmp17_, "page-removed", (GCallback) _book_view_remove_cb_book_page_removed, self, 0);
+#line 58 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp18_ = book;
+#line 58 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (_tmp18_, "reordered", (GCallback) _book_view_reorder_cb_book_reordered, self, 0);
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp19_ = book;
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (_tmp19_, "cleared", (GCallback) _book_view_clear_cb_book_cleared, self, 0);
+#line 61 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->need_layout = TRUE;
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp20_ = g_direct_hash;
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp21_ = g_direct_equal;
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp22_ = g_hash_table_new_full (_tmp20_, _tmp21_, _page_unref0_, _page_view_unref0_);
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_g_hash_table_unref0 (self->priv->page_data);
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->page_data = _tmp22_;
+#line 63 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->cursor = GDK_ARROW;
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp23_ = (GtkDrawingArea*) gtk_drawing_area_new ();
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_object_ref_sink (_tmp23_);
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_g_object_unref0 (self->priv->drawing_area);
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->drawing_area = (GtkWidget*) _tmp23_;
+#line 66 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp24_ = self->priv->drawing_area;
+#line 66 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	gtk_widget_set_size_request (_tmp24_, 200, 100);
+#line 67 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp25_ = self->priv->drawing_area;
+#line 67 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	gtk_widget_set_can_focus (_tmp25_, TRUE);
+#line 68 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp26_ = self->priv->drawing_area;
+#line 68 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	gtk_widget_set_events (_tmp26_, (gint) (((((GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK) | GDK_BUTTON_RELEASE_MASK) | GDK_FOCUS_CHANGE_MASK) | GDK_STRUCTURE_MASK) | GDK_SCROLL_MASK));
+#line 69 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp27_ = self->priv->drawing_area;
+#line 69 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	gtk_box_pack_start ((GtkBox*) self, _tmp27_, TRUE, TRUE, (guint) 0);
+#line 71 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp28_ = (GtkScrollbar*) gtk_scrollbar_new (GTK_ORIENTATION_HORIZONTAL, NULL);
+#line 71 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_object_ref_sink (_tmp28_);
+#line 71 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_g_object_unref0 (self->priv->scroll);
+#line 71 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->scroll = _tmp28_;
+#line 72 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp29_ = self->priv->scroll;
+#line 72 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp30_ = gtk_range_get_adjustment ((GtkRange*) _tmp29_);
+#line 72 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp31_ = _g_object_ref0 (_tmp30_);
+#line 72 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_g_object_unref0 (self->priv->adjustment);
+#line 72 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->adjustment = _tmp31_;
+#line 73 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp32_ = self->priv->scroll;
+#line 73 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	gtk_box_pack_start ((GtkBox*) self, (GtkWidget*) _tmp32_, FALSE, TRUE, (guint) 0);
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp33_ = self->priv->drawing_area;
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (_tmp33_, "configure-event", (GCallback) _book_view_configure_cb_gtk_widget_configure_event, self, 0);
+#line 76 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp34_ = self->priv->drawing_area;
+#line 76 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (_tmp34_, "draw", (GCallback) _book_view_draw_cb_gtk_widget_draw, self, 0);
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp35_ = self->priv->drawing_area;
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (_tmp35_, "motion-notify-event", (GCallback) _book_view_motion_cb_gtk_widget_motion_notify_event, self, 0);
+#line 78 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp36_ = self->priv->drawing_area;
+#line 78 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (_tmp36_, "key-press-event", (GCallback) _book_view_key_cb_gtk_widget_key_press_event, self, 0);
+#line 79 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp37_ = self->priv->drawing_area;
+#line 79 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (_tmp37_, "button-press-event", (GCallback) _book_view_button_cb_gtk_widget_button_press_event, self, 0);
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp38_ = self->priv->drawing_area;
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (_tmp38_, "button-release-event", (GCallback) _book_view_button_cb_gtk_widget_button_release_event, self, 0);
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp39_ = self->priv->drawing_area;
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (_tmp39_, "focus-in-event", (GCallback) _book_view_focus_cb_gtk_widget_focus_in_event, self, G_CONNECT_AFTER);
+#line 82 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp40_ = self->priv->drawing_area;
+#line 82 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (_tmp40_, "focus-out-event", (GCallback) _book_view_focus_cb_gtk_widget_focus_out_event, self, G_CONNECT_AFTER);
+#line 83 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp41_ = self->priv->adjustment;
+#line 83 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (_tmp41_, "value-changed", (GCallback) _book_view_scroll_cb_gtk_adjustment_value_changed, self, 0);
+#line 85 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp42_ = self->priv->drawing_area;
+#line 85 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	gtk_widget_show (_tmp42_);
+#line 42 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return self;
+#line 579 "book-view.c"
 }
 
 
 BookView* book_view_new (Book* book) {
+#line 42 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return book_view_construct (TYPE_BOOK_VIEW, book);
+#line 586 "book-view.c"
 }
 
 
 static gpointer _page_view_ref0 (gpointer self) {
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return self ? page_view_ref (self) : NULL;
+#line 593 "book-view.c"
 }
 
 
@@ -465,17 +602,29 @@ static PageView* book_view_get_nth_page (BookView* self, gint n) {
 	GHashTable* _tmp3_;
 	gconstpointer _tmp4_ = NULL;
 	PageView* _tmp5_;
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (self != NULL, NULL);
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = self->priv->book;
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = n;
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp2_ = book_get_page (_tmp0_, _tmp1_);
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	page = _tmp2_;
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp3_ = self->priv->page_data;
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp4_ = g_hash_table_lookup (_tmp3_, page);
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp5_ = _page_view_ref0 ((PageView*) _tmp4_);
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	result = _tmp5_;
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_unref0 (page);
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
+#line 628 "book-view.c"
 }
 
 
@@ -483,15 +632,23 @@ static PageView* book_view_get_next_page (BookView* self, PageView* page) {
 	PageView* result = NULL;
 	PageView* _tmp20_;
 	PageView* _tmp21_;
+#line 111 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (self != NULL, NULL);
+#line 111 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (page != NULL, NULL);
+#line 640 "book-view.c"
 	{
 		gint i;
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		i = 0;
+#line 645 "book-view.c"
 		{
 			gboolean _tmp0_;
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp0_ = TRUE;
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			while (TRUE) {
+#line 652 "book-view.c"
 				gboolean _tmp1_;
 				Book* _tmp3_;
 				gint _tmp4_;
@@ -503,61 +660,108 @@ static PageView* book_view_get_next_page (BookView* self, PageView* page) {
 				Page* _tmp9_ = NULL;
 				Page* _tmp10_;
 				gboolean _tmp11_;
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp1_ = _tmp0_;
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (!_tmp1_) {
+#line 668 "book-view.c"
 					gint _tmp2_;
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp2_ = i;
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					i = _tmp2_ + 1;
+#line 674 "book-view.c"
 				}
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp0_ = FALSE;
+#line 115 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp3_ = self->priv->book;
+#line 115 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp4_ = i;
+#line 115 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp5_ = book_get_page (_tmp3_, _tmp4_);
+#line 115 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				p = _tmp5_;
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp6_ = p;
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (_tmp6_ == NULL) {
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_page_unref0 (p);
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					break;
+#line 694 "book-view.c"
 				}
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp7_ = p;
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp8_ = page;
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp9_ = page_view_get_page (_tmp8_);
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp10_ = _tmp9_;
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp11_ = _tmp7_ == _tmp10_;
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_unref0 (_tmp10_);
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (_tmp11_) {
+#line 710 "book-view.c"
 					Book* _tmp12_;
 					gint _tmp13_;
 					Page* _tmp14_ = NULL;
 					Page* _tmp15_;
+#line 120 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp12_ = self->priv->book;
+#line 120 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp13_ = i;
+#line 120 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp14_ = book_get_page (_tmp12_, _tmp13_ + 1);
+#line 120 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_page_unref0 (p);
+#line 120 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					p = _tmp14_;
+#line 121 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp15_ = p;
+#line 121 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					if (_tmp15_ != NULL) {
+#line 729 "book-view.c"
 						GHashTable* _tmp16_;
 						Page* _tmp17_;
 						gconstpointer _tmp18_ = NULL;
 						PageView* _tmp19_;
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 						_tmp16_ = self->priv->page_data;
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 						_tmp17_ = p;
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 						_tmp18_ = g_hash_table_lookup (_tmp16_, _tmp17_);
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 						_tmp19_ = _page_view_ref0 ((PageView*) _tmp18_);
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 						result = _tmp19_;
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 						_page_unref0 (p);
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 						return result;
+#line 748 "book-view.c"
 					}
 				}
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_unref0 (p);
+#line 753 "book-view.c"
 			}
 		}
 	}
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp20_ = page;
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp21_ = _page_view_ref0 (_tmp20_);
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	result = _tmp21_;
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
+#line 765 "book-view.c"
 }
 
 
@@ -568,18 +772,29 @@ static PageView* book_view_get_prev_page (BookView* self, PageView* page) {
 	PageView* prev_page;
 	PageView* _tmp18_;
 	PageView* _tmp19_;
+#line 129 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (self != NULL, NULL);
+#line 129 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (page != NULL, NULL);
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = page;
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = _page_view_ref0 (_tmp0_);
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	prev_page = _tmp1_;
+#line 786 "book-view.c"
 	{
 		gint i;
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		i = 0;
+#line 791 "book-view.c"
 		{
 			gboolean _tmp2_;
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp2_ = TRUE;
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			while (TRUE) {
+#line 798 "book-view.c"
 				gboolean _tmp3_;
 				Book* _tmp5_;
 				gint _tmp6_;
@@ -595,78 +810,134 @@ static PageView* book_view_get_prev_page (BookView* self, PageView* page) {
 				Page* _tmp15_;
 				gconstpointer _tmp16_ = NULL;
 				PageView* _tmp17_;
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp3_ = _tmp2_;
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (!_tmp3_) {
+#line 818 "book-view.c"
 					gint _tmp4_;
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp4_ = i;
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					i = _tmp4_ + 1;
+#line 824 "book-view.c"
 				}
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp2_ = FALSE;
+#line 134 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp5_ = self->priv->book;
+#line 134 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp6_ = i;
+#line 134 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp7_ = book_get_page (_tmp5_, _tmp6_);
+#line 134 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				p = _tmp7_;
+#line 135 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp8_ = p;
+#line 135 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (_tmp8_ == NULL) {
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_page_unref0 (p);
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					break;
+#line 844 "book-view.c"
 				}
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp9_ = p;
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp10_ = page;
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp11_ = page_view_get_page (_tmp10_);
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp12_ = _tmp11_;
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp13_ = _tmp9_ == _tmp12_;
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_unref0 (_tmp12_);
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (_tmp13_) {
+#line 138 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					result = prev_page;
+#line 138 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_page_unref0 (p);
+#line 138 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					return result;
+#line 866 "book-view.c"
 				}
+#line 139 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp14_ = self->priv->page_data;
+#line 139 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp15_ = p;
+#line 139 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp16_ = g_hash_table_lookup (_tmp14_, _tmp15_);
+#line 139 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp17_ = _page_view_ref0 ((PageView*) _tmp16_);
+#line 139 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_view_unref0 (prev_page);
+#line 139 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				prev_page = _tmp17_;
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_unref0 (p);
+#line 882 "book-view.c"
 			}
 		}
 	}
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp18_ = page;
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp19_ = _page_view_ref0 (_tmp18_);
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	result = _tmp19_;
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_view_unref0 (prev_page);
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
+#line 896 "book-view.c"
 }
 
 
 static void book_view_page_view_changed_cb (BookView* self, PageView* page) {
+#line 145 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
+#line 145 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (page != NULL);
+#line 147 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_redraw (self);
+#line 907 "book-view.c"
 }
 
 
 static void book_view_page_view_size_changed_cb (BookView* self, PageView* page) {
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (page != NULL);
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->need_layout = TRUE;
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_redraw (self);
+#line 920 "book-view.c"
 }
 
 
 static void _book_view_page_view_changed_cb_page_view_changed (PageView* _sender, gpointer self) {
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_page_view_changed_cb (self, _sender);
+#line 927 "book-view.c"
 }
 
 
 static void _book_view_page_view_size_changed_cb_page_view_size_changed (PageView* _sender, gpointer self) {
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_page_view_size_changed_cb (self, _sender);
+#line 934 "book-view.c"
 }
 
 
 static gpointer _page_ref0 (gpointer self) {
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return self ? page_ref (self) : NULL;
+#line 941 "book-view.c"
 }
 
 
@@ -678,22 +949,39 @@ static void book_view_add_cb (BookView* self, Book* book, Page* page) {
 	Page* _tmp3_;
 	Page* _tmp4_;
 	PageView* _tmp5_;
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (book != NULL);
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (page != NULL);
+#line 158 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = page;
+#line 158 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = page_view_new (_tmp0_);
+#line 158 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	page_view = _tmp1_;
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (page_view, "changed", (GCallback) _book_view_page_view_changed_cb_page_view_changed, self, 0);
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (page_view, "size-changed", (GCallback) _book_view_page_view_size_changed_cb_page_view_size_changed, self, 0);
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp2_ = self->priv->page_data;
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp3_ = page;
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp4_ = _page_ref0 (_tmp3_);
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp5_ = _page_view_ref0 (page_view);
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_hash_table_insert (_tmp2_, _tmp4_, _tmp5_);
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->need_layout = TRUE;
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_redraw (self);
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_view_unref0 (page_view);
+#line 985 "book-view.c"
 }
 
 
@@ -707,42 +995,77 @@ static void book_view_set_selected_page (BookView* self, PageView* page) {
 	GtkWidget* _tmp9_;
 	gboolean _tmp10_ = FALSE;
 	gboolean _tmp11_;
+#line 166 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = self->priv->selected_page;
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp1_ != NULL) {
+#line 1005 "book-view.c"
 		PageView* _tmp2_;
 		PageView* _tmp3_;
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp2_ = page;
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp3_ = self->priv->selected_page;
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp0_ = _tmp2_ != _tmp3_;
+#line 1014 "book-view.c"
 	} else {
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp0_ = FALSE;
+#line 1018 "book-view.c"
 	}
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp4_ = _tmp0_;
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp4_) {
+#line 1024 "book-view.c"
 		PageView* _tmp5_;
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp5_ = self->priv->selected_page;
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		page_view_set_selected (_tmp5_, FALSE);
+#line 1030 "book-view.c"
 	}
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp6_ = page;
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp7_ = _page_view_ref0 (_tmp6_);
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_view_unref0 (self->priv->selected_page);
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->selected_page = _tmp7_;
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp8_ = self->priv->selected_page;
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp8_ == NULL) {
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return;
+#line 1046 "book-view.c"
 	}
+#line 177 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp9_ = self->priv->drawing_area;
+#line 177 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_object_get (_tmp9_, "has-focus", &_tmp10_, NULL);
+#line 177 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp11_ = _tmp10_;
+#line 177 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (!_tmp11_) {
+#line 1056 "book-view.c"
 		PageView* _tmp12_;
+#line 178 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp12_ = self->priv->selected_page;
+#line 178 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		page_view_set_selected (_tmp12_, FALSE);
+#line 1062 "book-view.c"
 	} else {
 		PageView* _tmp13_;
+#line 180 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp13_ = self->priv->selected_page;
+#line 180 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		page_view_set_selected (_tmp13_, TRUE);
+#line 1069 "book-view.c"
 	}
 }
 
@@ -750,10 +1073,15 @@ static void book_view_set_selected_page (BookView* self, PageView* page) {
 static void book_view_set_x_offset (BookView* self, gint offset) {
 	GtkAdjustment* _tmp0_;
 	gint _tmp1_;
+#line 183 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = self->priv->adjustment;
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = offset;
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	gtk_adjustment_set_value (_tmp0_, (gdouble) _tmp1_);
+#line 1085 "book-view.c"
 }
 
 
@@ -761,11 +1089,17 @@ static gint book_view_get_x_offset (BookView* self) {
 	gint result = 0;
 	GtkAdjustment* _tmp0_;
 	gdouble _tmp1_ = 0.0;
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (self != NULL, 0);
+#line 190 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = self->priv->adjustment;
+#line 190 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = gtk_adjustment_get_value (_tmp0_);
+#line 190 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	result = (gint) _tmp1_;
+#line 190 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
+#line 1103 "book-view.c"
 }
 
 
@@ -786,55 +1120,97 @@ static void book_view_show_page_view (BookView* self, PageView* page) {
 	gint right_edge;
 	gint _tmp13_;
 	gint _tmp14_ = 0;
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
+#line 195 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = page;
+#line 195 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp1_ == NULL) {
+#line 195 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp0_ = TRUE;
+#line 1132 "book-view.c"
 	} else {
 		GtkScrollbar* _tmp2_;
 		gboolean _tmp3_ = FALSE;
+#line 195 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp2_ = self->priv->scroll;
+#line 195 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp3_ = gtk_widget_get_visible ((GtkWidget*) _tmp2_);
+#line 195 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp0_ = !_tmp3_;
+#line 1142 "book-view.c"
 	}
+#line 195 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp4_ = _tmp0_;
+#line 195 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp4_) {
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return;
+#line 1150 "book-view.c"
 	}
+#line 199 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp5_ = self->priv->drawing_area;
+#line 199 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	gtk_widget_get_allocation (_tmp5_, &_tmp6_);
+#line 199 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	allocation = _tmp6_;
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp7_ = page;
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp8_ = page_view_get_x_offset (_tmp7_);
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	left_edge = _tmp8_;
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp9_ = page;
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp10_ = page_view_get_x_offset (_tmp9_);
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp11_ = page;
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp12_ = page_view_get_width (_tmp11_);
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	right_edge = _tmp10_ + _tmp12_;
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp13_ = left_edge;
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp14_ = book_view_get_x_offset (self);
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if ((_tmp13_ - _tmp14_) < 0) {
+#line 1180 "book-view.c"
 		gint _tmp15_;
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp15_ = left_edge;
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		book_view_set_x_offset (self, _tmp15_);
+#line 1186 "book-view.c"
 	} else {
 		gint _tmp16_;
 		gint _tmp17_ = 0;
 		GtkAllocation _tmp18_;
 		gint _tmp19_;
+#line 205 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp16_ = right_edge;
+#line 205 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp17_ = book_view_get_x_offset (self);
+#line 205 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp18_ = allocation;
+#line 205 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp19_ = _tmp18_.width;
+#line 205 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		if ((_tmp16_ - _tmp17_) > _tmp19_) {
+#line 1202 "book-view.c"
 			gint _tmp20_;
 			GtkAllocation _tmp21_;
 			gint _tmp22_;
+#line 206 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp20_ = right_edge;
+#line 206 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp21_ = allocation;
+#line 206 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp22_ = _tmp21_.width;
+#line 206 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			book_view_set_x_offset (self, _tmp20_ - _tmp22_);
+#line 1214 "book-view.c"
 		}
 	}
 }
@@ -848,36 +1224,65 @@ static void book_view_select_page_view (BookView* self, PageView* page) {
 	gboolean _tmp3_;
 	PageView* _tmp5_;
 	Page* _tmp8_;
+#line 209 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
+#line 211 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	p = NULL;
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = self->priv->selected_page;
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = page;
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp0_ == _tmp1_) {
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_page_unref0 (p);
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return;
+#line 1242 "book-view.c"
 	}
+#line 216 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp2_ = page;
+#line 216 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_set_selected_page (self, _tmp2_);
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp3_ = self->priv->need_layout;
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp3_) {
+#line 219 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		self->priv->show_selected_page = TRUE;
+#line 1254 "book-view.c"
 	} else {
 		PageView* _tmp4_;
+#line 221 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp4_ = page;
+#line 221 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		book_view_show_page_view (self, _tmp4_);
+#line 1261 "book-view.c"
 	}
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp5_ = page;
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp5_ != NULL) {
+#line 1267 "book-view.c"
 		PageView* _tmp6_;
 		Page* _tmp7_ = NULL;
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp6_ = page;
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp7_ = page_view_get_page (_tmp6_);
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_page_unref0 (p);
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		p = _tmp7_;
+#line 1278 "book-view.c"
 	}
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp8_ = p;
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_emit_by_name (self, "page-selected", _tmp8_);
+#line 209 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_unref0 (p);
+#line 1286 "book-view.c"
 }
 
 
@@ -899,79 +1304,142 @@ static void book_view_remove_cb (BookView* self, Book* book, Page* page) {
 	GHashTable* _tmp18_;
 	Page* _tmp19_;
 	PageView* _tmp20_;
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (book != NULL);
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (page != NULL);
+#line 230 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = self->priv->selected_page;
+#line 230 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = _page_view_ref0 (_tmp0_);
+#line 230 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	new_selection = _tmp1_;
+#line 233 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp2_ = page;
+#line 233 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp3_ = book_view_get_selected (self);
+#line 233 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp4_ = _tmp3_;
+#line 233 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp5_ = _tmp2_ == _tmp4_;
+#line 233 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_unref0 (_tmp4_);
+#line 233 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp5_) {
+#line 1332 "book-view.c"
 		PageView* _tmp6_;
 		PageView* _tmp7_ = NULL;
 		PageView* _tmp8_;
 		PageView* _tmp9_;
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp6_ = self->priv->selected_page;
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp7_ = book_view_get_prev_page (self, _tmp6_);
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_page_view_unref0 (new_selection);
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		new_selection = _tmp7_;
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp8_ = new_selection;
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp9_ = self->priv->selected_page;
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		if (_tmp8_ == _tmp9_) {
+#line 1351 "book-view.c"
 			PageView* _tmp10_;
 			PageView* _tmp11_ = NULL;
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp10_ = self->priv->selected_page;
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp11_ = book_view_get_next_page (self, _tmp10_);
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_page_view_unref0 (new_selection);
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			new_selection = _tmp11_;
+#line 1362 "book-view.c"
 		}
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_page_view_unref0 (self->priv->selected_page);
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		self->priv->selected_page = NULL;
+#line 1368 "book-view.c"
 	}
+#line 241 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp12_ = self->priv->page_data;
+#line 241 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp13_ = page;
+#line 241 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp14_ = g_hash_table_lookup (_tmp12_, _tmp13_);
+#line 241 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp15_ = _page_view_ref0 ((PageView*) _tmp14_);
+#line 241 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	page_view = _tmp15_;
+#line 242 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("changed", TYPE_PAGE_VIEW, &_tmp16_, NULL, FALSE);
+#line 242 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (page_view, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) _book_view_page_view_changed_cb_page_view_changed, self);
+#line 243 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("size-changed", TYPE_PAGE_VIEW, &_tmp17_, NULL, FALSE);
+#line 243 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (page_view, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp17_, 0, NULL, (GCallback) _book_view_page_view_size_changed_cb_page_view_size_changed, self);
+#line 244 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp18_ = self->priv->page_data;
+#line 244 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp19_ = page;
+#line 244 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_hash_table_remove (_tmp18_, _tmp19_);
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp20_ = new_selection;
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_select_page_view (self, _tmp20_);
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->need_layout = TRUE;
+#line 249 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_redraw (self);
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_view_unref0 (page_view);
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_view_unref0 (new_selection);
+#line 1406 "book-view.c"
 }
 
 
 static void book_view_reorder_cb (BookView* self, Book* book) {
+#line 252 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
+#line 252 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (book != NULL);
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->need_layout = TRUE;
+#line 255 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_redraw (self);
+#line 1419 "book-view.c"
 }
 
 
 static void book_view_clear_cb (BookView* self, Book* book) {
 	GHashTable* _tmp0_;
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (book != NULL);
+#line 260 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = self->priv->page_data;
+#line 260 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_hash_table_remove_all (_tmp0_);
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_view_unref0 (self->priv->selected_page);
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->selected_page = NULL;
+#line 262 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_emit_by_name (self, "page-selected", NULL);
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->need_layout = TRUE;
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_redraw (self);
+#line 1443 "book-view.c"
 }
 
 
@@ -979,22 +1447,35 @@ Book* book_view_get_book (BookView* self) {
 	Book* result = NULL;
 	Book* _tmp0_;
 	Book* _tmp1_;
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (self != NULL, NULL);
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = self->priv->book;
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = _book_ref0 (_tmp0_);
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	result = _tmp1_;
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
+#line 1461 "book-view.c"
 }
 
 
 static gboolean book_view_configure_cb (BookView* self, GtkWidget* widget, GdkEventConfigure* event) {
 	gboolean result = FALSE;
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
+#line 274 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->need_layout = TRUE;
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	result = FALSE;
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
+#line 1479 "book-view.c"
 }
 
 
@@ -1012,15 +1493,23 @@ static void book_view_layout_into (BookView* self, gint width, gint height, gint
 	gdouble max_aspect;
 	gint spacing;
 	gint x_offset;
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	max_dpi = 0;
+#line 1501 "book-view.c"
 	{
 		gint i;
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		i = 0;
+#line 1506 "book-view.c"
 		{
 			gboolean _tmp0_;
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp0_ = TRUE;
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			while (TRUE) {
+#line 1513 "book-view.c"
 				gboolean _tmp1_;
 				gint _tmp3_;
 				Book* _tmp4_;
@@ -1032,46 +1521,82 @@ static void book_view_layout_into (BookView* self, gint width, gint height, gint
 				Page* _tmp9_;
 				gint _tmp10_ = 0;
 				gint _tmp11_;
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp1_ = _tmp0_;
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (!_tmp1_) {
+#line 1529 "book-view.c"
 					gint _tmp2_;
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp2_ = i;
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					i = _tmp2_ + 1;
+#line 1535 "book-view.c"
 				}
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp0_ = FALSE;
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp3_ = i;
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp4_ = self->priv->book;
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp5_ = book_get_n_pages (_tmp4_);
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (!(((guint) _tmp3_) < _tmp5_)) {
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					break;
+#line 1549 "book-view.c"
 				}
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp6_ = self->priv->book;
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp7_ = i;
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp8_ = book_get_page (_tmp6_, _tmp7_);
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				page = _tmp8_;
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp9_ = page;
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp10_ = page_get_dpi (_tmp9_);
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp11_ = max_dpi;
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (_tmp10_ > _tmp11_) {
+#line 1567 "book-view.c"
 					Page* _tmp12_;
 					gint _tmp13_ = 0;
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp12_ = page;
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp13_ = page_get_dpi (_tmp12_);
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					max_dpi = _tmp13_;
+#line 1576 "book-view.c"
 				}
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_unref0 (page);
+#line 1580 "book-view.c"
 			}
 		}
 	}
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	max_width = 0;
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	max_height = 0;
+#line 1588 "book-view.c"
 	{
 		gint i;
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		i = 0;
+#line 1593 "book-view.c"
 		{
 			gboolean _tmp14_;
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp14_ = TRUE;
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			while (TRUE) {
+#line 1600 "book-view.c"
 				gboolean _tmp15_;
 				gint _tmp17_;
 				Book* _tmp18_;
@@ -1098,73 +1623,137 @@ static void book_view_layout_into (BookView* self, gint width, gint height, gint
 				gint _tmp36_;
 				gint _tmp38_;
 				gint _tmp39_;
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp15_ = _tmp14_;
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (!_tmp15_) {
+#line 1631 "book-view.c"
 					gint _tmp16_;
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp16_ = i;
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					i = _tmp16_ + 1;
+#line 1637 "book-view.c"
 				}
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp14_ = FALSE;
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp17_ = i;
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp18_ = self->priv->book;
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp19_ = book_get_n_pages (_tmp18_);
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (!(((guint) _tmp17_) < _tmp19_)) {
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					break;
+#line 1651 "book-view.c"
 				}
+#line 293 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp20_ = self->priv->book;
+#line 293 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp21_ = i;
+#line 293 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp22_ = book_get_page (_tmp20_, _tmp21_);
+#line 293 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				page = _tmp22_;
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp23_ = page;
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp24_ = page_get_width (_tmp23_);
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				w = _tmp24_;
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp25_ = page;
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp26_ = page_get_height (_tmp25_);
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				h = _tmp26_;
+#line 298 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp27_ = w;
+#line 298 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp28_ = max_dpi;
+#line 298 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp29_ = page;
+#line 298 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp30_ = page_get_dpi (_tmp29_);
+#line 298 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				w = (gint) (((((gdouble) _tmp27_) * _tmp28_) / _tmp30_) + 0.5);
+#line 299 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp31_ = h;
+#line 299 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp32_ = max_dpi;
+#line 299 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp33_ = page;
+#line 299 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp34_ = page_get_dpi (_tmp33_);
+#line 299 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				h = (gint) (((((gdouble) _tmp31_) * _tmp32_) / _tmp34_) + 0.5);
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp35_ = w;
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp36_ = max_width;
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (_tmp35_ > _tmp36_) {
+#line 1699 "book-view.c"
 					gint _tmp37_;
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp37_ = w;
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					max_width = _tmp37_;
+#line 1705 "book-view.c"
 				}
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp38_ = h;
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp39_ = max_height;
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (_tmp38_ > _tmp39_) {
+#line 1713 "book-view.c"
 					gint _tmp40_;
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp40_ = h;
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					max_height = _tmp40_;
+#line 1719 "book-view.c"
 				}
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_unref0 (page);
+#line 1723 "book-view.c"
 			}
 		}
 	}
+#line 307 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp41_ = width;
+#line 307 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp42_ = height;
+#line 307 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	aspect = ((gdouble) _tmp41_) / _tmp42_;
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp43_ = max_width;
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp44_ = max_height;
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	max_aspect = ((gdouble) _tmp43_) / _tmp44_;
+#line 311 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	spacing = 12;
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_vala_book_width = 0;
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_vala_book_height = 0;
+#line 1745 "book-view.c"
 	{
 		gint i;
+#line 314 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		i = 0;
+#line 1750 "book-view.c"
 		{
 			gboolean _tmp45_;
+#line 314 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp45_ = TRUE;
+#line 314 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			while (TRUE) {
+#line 1757 "book-view.c"
 				gboolean _tmp46_;
 				gint _tmp48_;
 				Book* _tmp49_;
@@ -1186,28 +1775,51 @@ static void book_view_layout_into (BookView* self, gint width, gint height, gint
 				PageView* _tmp81_;
 				gint _tmp82_ = 0;
 				gint _tmp83_;
+#line 314 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp46_ = _tmp45_;
+#line 314 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (!_tmp46_) {
+#line 1783 "book-view.c"
 					gint _tmp47_;
+#line 314 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp47_ = i;
+#line 314 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					i = _tmp47_ + 1;
+#line 1789 "book-view.c"
 				}
+#line 314 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp45_ = FALSE;
+#line 314 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp48_ = i;
+#line 314 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp49_ = self->priv->book;
+#line 314 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp50_ = book_get_n_pages (_tmp49_);
+#line 314 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (!(((guint) _tmp48_) < _tmp50_)) {
+#line 314 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					break;
+#line 1803 "book-view.c"
 				}
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp51_ = i;
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp52_ = book_view_get_nth_page (self, _tmp51_);
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				page = _tmp52_;
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp53_ = page;
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp54_ = page_view_get_page (_tmp53_);
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				p = _tmp54_;
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp55_ = max_aspect;
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp56_ = aspect;
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (_tmp55_ > _tmp56_) {
+#line 1823 "book-view.c"
 					Page* _tmp57_;
 					gint _tmp58_ = 0;
 					gint _tmp59_;
@@ -1218,17 +1830,29 @@ static void book_view_layout_into (BookView* self, gint width, gint height, gint
 					gint w;
 					PageView* _tmp64_;
 					gint _tmp65_;
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp57_ = p;
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp58_ = page_get_width (_tmp57_);
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp59_ = max_dpi;
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp60_ = width;
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp61_ = p;
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp62_ = page_get_dpi (_tmp61_);
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp63_ = max_width;
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					w = (gint) (((((gdouble) _tmp58_) * _tmp59_) * _tmp60_) / (_tmp62_ * _tmp63_));
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp64_ = page;
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp65_ = w;
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					page_view_set_width (_tmp64_, _tmp65_);
+#line 1856 "book-view.c"
 				} else {
 					Page* _tmp66_;
 					gint _tmp67_ = 0;
@@ -1240,53 +1864,96 @@ static void book_view_layout_into (BookView* self, gint width, gint height, gint
 					gint h;
 					PageView* _tmp73_;
 					gint _tmp74_;
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp66_ = p;
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp67_ = page_get_height (_tmp66_);
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp68_ = max_dpi;
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp69_ = height;
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp70_ = p;
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp71_ = page_get_dpi (_tmp70_);
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp72_ = max_height;
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					h = (gint) (((((gdouble) _tmp67_) * _tmp68_) * _tmp69_) / (_tmp71_ * _tmp72_));
+#line 330 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp73_ = page;
+#line 330 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp74_ = h;
+#line 330 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					page_view_set_height (_tmp73_, _tmp74_);
+#line 1890 "book-view.c"
 				}
+#line 333 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp75_ = page;
+#line 333 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp76_ = page_view_get_height (_tmp75_);
+#line 333 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				h = _tmp76_;
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp77_ = h;
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp78_ = _vala_book_height;
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (_tmp77_ > _tmp78_) {
+#line 1904 "book-view.c"
 					gint _tmp79_;
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp79_ = h;
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_vala_book_height = _tmp79_;
+#line 1910 "book-view.c"
 				}
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp80_ = _vala_book_width;
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp81_ = page;
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp82_ = page_view_get_width (_tmp81_);
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_vala_book_width = _tmp80_ + _tmp82_;
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp83_ = i;
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (_tmp83_ != 0) {
+#line 1924 "book-view.c"
 					gint _tmp84_;
 					gint _tmp85_;
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp84_ = _vala_book_width;
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp85_ = spacing;
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_vala_book_width = _tmp84_ + _tmp85_;
+#line 1933 "book-view.c"
 				}
+#line 314 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_unref0 (p);
+#line 314 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_view_unref0 (page);
+#line 1939 "book-view.c"
 			}
 		}
 	}
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	x_offset = 0;
+#line 1945 "book-view.c"
 	{
 		gint i;
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		i = 0;
+#line 1950 "book-view.c"
 		{
 			gboolean _tmp86_;
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp86_ = TRUE;
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			while (TRUE) {
+#line 1957 "book-view.c"
 				gboolean _tmp87_;
 				gint _tmp89_;
 				Book* _tmp90_;
@@ -1304,44 +1971,81 @@ static void book_view_layout_into (BookView* self, gint width, gint height, gint
 				gint _tmp101_;
 				PageView* _tmp102_;
 				gint _tmp103_ = 0;
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp87_ = _tmp86_;
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (!_tmp87_) {
+#line 1979 "book-view.c"
 					gint _tmp88_;
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp88_ = i;
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					i = _tmp88_ + 1;
+#line 1985 "book-view.c"
 				}
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp86_ = FALSE;
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp89_ = i;
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp90_ = self->priv->book;
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp91_ = book_get_n_pages (_tmp90_);
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (!(((guint) _tmp89_) < _tmp91_)) {
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					break;
+#line 1999 "book-view.c"
 				}
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp92_ = i;
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp93_ = book_view_get_nth_page (self, _tmp92_);
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				page = _tmp93_;
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp94_ = page;
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp95_ = x_offset;
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				page_view_set_x_offset (_tmp94_, _tmp95_);
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp96_ = x_offset;
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp97_ = page;
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp98_ = page_view_get_width (_tmp97_);
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp99_ = spacing;
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				x_offset = _tmp96_ + (_tmp98_ + _tmp99_);
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp100_ = page;
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp101_ = height;
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp102_ = page;
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp103_ = page_view_get_height (_tmp102_);
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				page_view_set_y_offset (_tmp100_, (_tmp101_ - _tmp103_) / 2);
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_view_unref0 (page);
+#line 2035 "book-view.c"
 			}
 		}
 	}
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (book_width) {
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		*book_width = _vala_book_width;
+#line 2043 "book-view.c"
 	}
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (book_height) {
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		*book_height = _vala_book_height;
+#line 2049 "book-view.c"
 	}
 }
 
@@ -1377,43 +2081,81 @@ static void book_view_layout (BookView* self) {
 	GtkAllocation _tmp20_;
 	gint _tmp21_;
 	gboolean _tmp54_;
+#line 355 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = self->priv->need_layout;
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (!_tmp0_) {
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return;
+#line 2093 "book-view.c"
 	}
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->laying_out = TRUE;
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = self->priv->drawing_area;
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	gtk_widget_get_allocation (_tmp1_, &_tmp2_);
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	allocation = _tmp2_;
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	gtk_widget_get_allocation ((GtkWidget*) self, &_tmp3_);
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	box_allocation = _tmp3_;
+#line 368 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	right_aligned = TRUE;
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp4_ = self->priv->adjustment;
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp5_ = gtk_adjustment_get_value (_tmp4_);
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp6_ = self->priv->adjustment;
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp7_ = gtk_adjustment_get_upper (_tmp6_);
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp8_ = self->priv->adjustment;
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp9_ = gtk_adjustment_get_page_size (_tmp8_);
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp5_ < (_tmp7_ - _tmp9_)) {
+#line 370 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		right_aligned = FALSE;
+#line 2125 "book-view.c"
 	}
+#line 373 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp10_ = allocation;
+#line 373 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp11_ = _tmp10_.width;
+#line 373 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	width = (gint) _tmp11_;
+#line 374 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp12_ = box_allocation;
+#line 374 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp13_ = _tmp12_.height;
+#line 374 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp14_ = gtk_container_get_border_width ((GtkContainer*) self);
+#line 374 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	height = (gint) (_tmp13_ - (_tmp14_ * 2));
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp15_ = width;
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp16_ = height;
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_layout_into (self, _tmp15_, _tmp16_, &_tmp17_, &_tmp18_);
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_width = _tmp17_;
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_height = _tmp18_;
+#line 379 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp19_ = book_width;
+#line 379 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp20_ = allocation;
+#line 379 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp21_ = _tmp20_.width;
+#line 379 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp19_ > _tmp21_) {
+#line 2159 "book-view.c"
 		GtkAllocation _tmp22_;
 		gint _tmp23_;
 		gint _tmp24_;
@@ -1434,45 +2176,83 @@ static void book_view_layout (BookView* self) {
 		gboolean _tmp38_;
 		gboolean _tmp41_;
 		GtkScrollbar* _tmp43_;
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp22_ = allocation;
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp23_ = _tmp22_.height;
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		height = _tmp23_;
+#line 383 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp24_ = width;
+#line 383 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp25_ = height;
+#line 383 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		book_view_layout_into (self, _tmp24_, _tmp25_, &_tmp26_, &_tmp27_);
+#line 383 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		book_width = _tmp26_;
+#line 383 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		book_height = _tmp27_;
+#line 386 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp28_ = self->priv->adjustment;
+#line 386 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		gtk_adjustment_set_lower (_tmp28_, (gdouble) 0);
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp29_ = self->priv->adjustment;
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp30_ = book_width;
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		gtk_adjustment_set_upper (_tmp29_, (gdouble) _tmp30_);
+#line 388 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp31_ = self->priv->adjustment;
+#line 388 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp32_ = allocation;
+#line 388 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp33_ = _tmp32_.width;
+#line 388 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		gtk_adjustment_set_page_size (_tmp31_, (gdouble) _tmp33_);
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp34_ = book_width;
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp35_ = allocation;
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp36_ = _tmp35_.width;
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		max_offset = _tmp34_ - _tmp36_;
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp38_ = right_aligned;
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		if (_tmp38_) {
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp37_ = TRUE;
+#line 2228 "book-view.c"
 		} else {
 			gint _tmp39_ = 0;
 			gint _tmp40_;
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp39_ = book_view_get_x_offset (self);
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp40_ = max_offset;
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp37_ = _tmp39_ > _tmp40_;
+#line 2238 "book-view.c"
 		}
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp41_ = _tmp37_;
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		if (_tmp41_) {
+#line 2244 "book-view.c"
 			gint _tmp42_;
+#line 393 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp42_ = max_offset;
+#line 393 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			book_view_set_x_offset (self, _tmp42_);
+#line 2250 "book-view.c"
 		}
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp43_ = self->priv->scroll;
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		gtk_widget_show ((GtkWidget*) _tmp43_);
+#line 2256 "book-view.c"
 	} else {
 		GtkScrollbar* _tmp44_;
 		gint _tmp45_;
@@ -1485,32 +2265,59 @@ static void book_view_layout (BookView* self) {
 		gint _tmp51_;
 		GtkAdjustment* _tmp52_;
 		gint _tmp53_;
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp44_ = self->priv->scroll;
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		gtk_widget_hide ((GtkWidget*) _tmp44_);
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp45_ = book_width;
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp46_ = allocation;
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp47_ = _tmp46_.width;
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		offset = (_tmp45_ - _tmp47_) / 2;
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp48_ = self->priv->adjustment;
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp49_ = offset;
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		gtk_adjustment_set_lower (_tmp48_, (gdouble) _tmp49_);
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp50_ = self->priv->adjustment;
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp51_ = offset;
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		gtk_adjustment_set_upper (_tmp50_, (gdouble) _tmp51_);
+#line 403 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp52_ = self->priv->adjustment;
+#line 403 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		gtk_adjustment_set_page_size (_tmp52_, (gdouble) 0);
+#line 404 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp53_ = offset;
+#line 404 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		book_view_set_x_offset (self, _tmp53_);
+#line 2301 "book-view.c"
 	}
+#line 407 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp54_ = self->priv->show_selected_page;
+#line 407 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp54_) {
+#line 2307 "book-view.c"
 		PageView* _tmp55_;
+#line 408 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp55_ = self->priv->selected_page;
+#line 408 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		book_view_show_page_view (self, _tmp55_);
+#line 2313 "book-view.c"
 	}
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->need_layout = FALSE;
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->show_selected_page = FALSE;
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->laying_out = FALSE;
+#line 2321 "book-view.c"
 }
 
 
@@ -1527,29 +2334,51 @@ static gboolean book_view_draw_cb (BookView* self, GtkWidget* widget, cairo_t* c
 	gdouble _tmp4_ = 0.0;
 	gdouble _tmp5_ = 0.0;
 	gdouble _tmp6_ = 0.0;
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (context != NULL, FALSE);
+#line 417 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = self->priv->book;
+#line 417 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = book_get_n_pages (_tmp0_);
+#line 417 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp1_ == ((guint) 0)) {
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		result = FALSE;
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return result;
+#line 2354 "book-view.c"
 	}
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_layout (self);
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp2_ = context;
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	cairo_clip_extents (_tmp2_, &_tmp3_, &_tmp4_, &_tmp5_, &_tmp6_);
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	left = _tmp3_;
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	top = _tmp4_;
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	right = _tmp5_;
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	bottom = _tmp6_;
+#line 2370 "book-view.c"
 	{
 		gint i;
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		i = 0;
+#line 2375 "book-view.c"
 		{
 			gboolean _tmp7_;
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp7_ = TRUE;
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			while (TRUE) {
+#line 2382 "book-view.c"
 				gboolean _tmp8_;
 				gint _tmp10_;
 				Book* _tmp11_;
@@ -1579,61 +2408,115 @@ static gboolean book_view_draw_cb (BookView* self, GtkWidget* widget, cairo_t* c
 				cairo_t* _tmp34_;
 				PageView* _tmp35_;
 				gboolean _tmp36_ = FALSE;
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp8_ = _tmp7_;
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (!_tmp8_) {
+#line 2416 "book-view.c"
 					gint _tmp9_;
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp9_ = i;
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					i = _tmp9_ + 1;
+#line 2422 "book-view.c"
 				}
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp7_ = FALSE;
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp10_ = i;
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp11_ = self->priv->book;
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp12_ = book_get_n_pages (_tmp11_);
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (!(((guint) _tmp10_) < _tmp12_)) {
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					break;
+#line 2436 "book-view.c"
 				}
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp13_ = i;
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp14_ = book_view_get_nth_page (self, _tmp13_);
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				page = _tmp14_;
+#line 429 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp15_ = page;
+#line 429 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp16_ = page_view_get_x_offset (_tmp15_);
+#line 429 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp17_ = book_view_get_x_offset (self);
+#line 429 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				left_edge = _tmp16_ - _tmp17_;
+#line 430 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp18_ = page;
+#line 430 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp19_ = page_view_get_x_offset (_tmp18_);
+#line 430 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp20_ = page;
+#line 430 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp21_ = page_view_get_width (_tmp20_);
+#line 430 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp22_ = book_view_get_x_offset (self);
+#line 430 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				right_edge = (_tmp19_ + _tmp21_) - _tmp22_;
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp24_ = right_edge;
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp25_ = left;
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (((gdouble) _tmp24_) < _tmp25_) {
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp23_ = TRUE;
+#line 2472 "book-view.c"
 				} else {
 					gint _tmp26_;
 					gdouble _tmp27_;
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp26_ = left_edge;
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp27_ = right;
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp23_ = ((gdouble) _tmp26_) > _tmp27_;
+#line 2482 "book-view.c"
 				}
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp28_ = _tmp23_;
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (_tmp28_) {
+#line 434 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_page_view_unref0 (page);
+#line 434 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					continue;
+#line 2492 "book-view.c"
 				}
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp29_ = context;
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				cairo_save (_tmp29_);
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp30_ = context;
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp31_ = book_view_get_x_offset (self);
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				cairo_translate (_tmp30_, (gdouble) (-_tmp31_), (gdouble) 0);
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp32_ = page;
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp33_ = context;
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				page_view_render (_tmp32_, _tmp33_);
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp34_ = context;
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				cairo_restore (_tmp34_);
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp35_ = page;
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp36_ = page_view_get_selected (_tmp35_);
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (_tmp36_) {
+#line 2520 "book-view.c"
 					GtkWidget* _tmp37_;
 					GtkStyleContext* _tmp38_ = NULL;
 					cairo_t* _tmp39_;
@@ -1646,26 +2529,45 @@ static gboolean book_view_draw_cb (BookView* self, GtkWidget* widget, cairo_t* c
 					gint _tmp46_ = 0;
 					PageView* _tmp47_;
 					gint _tmp48_ = 0;
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp37_ = self->priv->drawing_area;
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp38_ = gtk_widget_get_style_context (_tmp37_);
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp39_ = context;
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp40_ = page;
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp41_ = page_view_get_x_offset (_tmp40_);
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp42_ = book_view_get_x_offset (self);
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp43_ = page;
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp44_ = page_view_get_y_offset (_tmp43_);
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp45_ = page;
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp46_ = page_view_get_width (_tmp45_);
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp47_ = page;
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp48_ = page_view_get_height (_tmp47_);
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					gtk_render_focus (_tmp38_, _tmp39_, (gdouble) (_tmp41_ - _tmp42_), (gdouble) _tmp44_, (gdouble) _tmp46_, (gdouble) _tmp48_);
+#line 2559 "book-view.c"
 				}
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_view_unref0 (page);
+#line 2563 "book-view.c"
 			}
 		}
 	}
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	result = FALSE;
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
+#line 2571 "book-view.c"
 }
 
 
@@ -1674,17 +2576,27 @@ static PageView* book_view_get_page_at (BookView* self, gint x, gint y, gint* x_
 	gint _vala_y_ = 0;
 	PageView* result = NULL;
 	gint _tmp0_;
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (self != NULL, NULL);
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_vala_y_ = 0;
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = _vala_y_;
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_vala_x_ = _tmp0_;
+#line 2588 "book-view.c"
 	{
 		gint i;
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		i = 0;
+#line 2593 "book-view.c"
 		{
 			gboolean _tmp1_;
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp1_ = TRUE;
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			while (TRUE) {
+#line 2600 "book-view.c"
 				gboolean _tmp2_;
 				gint _tmp4_;
 				Book* _tmp5_;
@@ -1714,100 +2626,187 @@ static PageView* book_view_get_page_at (BookView* self, gint x, gint y, gint* x_
 				gboolean _tmp26_;
 				gboolean _tmp29_;
 				gboolean _tmp32_;
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp2_ = _tmp1_;
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (!_tmp2_) {
+#line 2634 "book-view.c"
 					gint _tmp3_;
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp3_ = i;
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					i = _tmp3_ + 1;
+#line 2640 "book-view.c"
 				}
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp1_ = FALSE;
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp4_ = i;
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp5_ = self->priv->book;
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp6_ = book_get_n_pages (_tmp5_);
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (!(((guint) _tmp4_) < _tmp6_)) {
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					break;
+#line 2654 "book-view.c"
 				}
+#line 457 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp7_ = i;
+#line 457 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp8_ = book_view_get_nth_page (self, _tmp7_);
+#line 457 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				page = _tmp8_;
+#line 458 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp9_ = page;
+#line 458 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp10_ = page_view_get_x_offset (_tmp9_);
+#line 458 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				left = _tmp10_;
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp11_ = left;
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp12_ = page;
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp13_ = page_view_get_width (_tmp12_);
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				right = _tmp11_ + _tmp13_;
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp14_ = page;
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp15_ = page_view_get_y_offset (_tmp14_);
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				top = _tmp15_;
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp16_ = top;
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp17_ = page;
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp18_ = page_view_get_height (_tmp17_);
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				bottom = _tmp16_ + _tmp18_;
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp22_ = x;
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp23_ = left;
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (_tmp22_ >= _tmp23_) {
+#line 2696 "book-view.c"
 					gint _tmp24_;
 					gint _tmp25_;
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp24_ = x;
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp25_ = right;
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp21_ = _tmp24_ <= _tmp25_;
+#line 2705 "book-view.c"
 				} else {
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp21_ = FALSE;
+#line 2709 "book-view.c"
 				}
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp26_ = _tmp21_;
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (_tmp26_) {
+#line 2715 "book-view.c"
 					gint _tmp27_;
 					gint _tmp28_;
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp27_ = y;
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp28_ = top;
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp20_ = _tmp27_ >= _tmp28_;
+#line 2724 "book-view.c"
 				} else {
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp20_ = FALSE;
+#line 2728 "book-view.c"
 				}
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp29_ = _tmp20_;
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (_tmp29_) {
+#line 2734 "book-view.c"
 					gint _tmp30_;
 					gint _tmp31_;
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp30_ = y;
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp31_ = bottom;
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp19_ = _tmp30_ <= _tmp31_;
+#line 2743 "book-view.c"
 				} else {
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp19_ = FALSE;
+#line 2747 "book-view.c"
 				}
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp32_ = _tmp19_;
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (_tmp32_) {
+#line 2753 "book-view.c"
 					gint _tmp33_;
 					gint _tmp34_;
 					gint _tmp35_;
 					gint _tmp36_;
+#line 464 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp33_ = x;
+#line 464 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp34_ = left;
+#line 464 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_vala_x_ = _tmp33_ - _tmp34_;
+#line 465 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp35_ = y;
+#line 465 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp36_ = top;
+#line 465 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_vala_y_ = _tmp35_ - _tmp36_;
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					result = page;
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					if (x_) {
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 						*x_ = _vala_x_;
+#line 2776 "book-view.c"
 					}
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					if (y_) {
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 						*y_ = _vala_y_;
+#line 2782 "book-view.c"
 					}
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					return result;
+#line 2786 "book-view.c"
 				}
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_view_unref0 (page);
+#line 2790 "book-view.c"
 			}
 		}
 	}
+#line 470 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	result = NULL;
+#line 470 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (x_) {
+#line 470 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		*x_ = _vala_x_;
+#line 2800 "book-view.c"
 	}
+#line 470 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (y_) {
+#line 470 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		*y_ = _vala_y_;
+#line 2806 "book-view.c"
 	}
+#line 470 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
+#line 2810 "book-view.c"
 }
 
 
@@ -1823,17 +2822,29 @@ static gboolean book_view_button_cb (BookView* self, GtkWidget* widget, GdkEvent
 	guint _tmp14_;
 	GdkEventButton _tmp29_;
 	guint _tmp30_;
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_layout (self);
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = self->priv->drawing_area;
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	gtk_widget_grab_focus (_tmp0_);
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	x = 0;
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	y = 0;
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = *event;
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp2_ = _tmp1_.type;
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp2_ == GDK_BUTTON_PRESS) {
+#line 2848 "book-view.c"
 		GdkEventButton _tmp3_;
 		gdouble _tmp4_;
 		gint _tmp5_ = 0;
@@ -1843,74 +2854,130 @@ static gboolean book_view_button_cb (BookView* self, GtkWidget* widget, GdkEvent
 		gint _tmp9_ = 0;
 		PageView* _tmp10_ = NULL;
 		PageView* _tmp11_;
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp3_ = *event;
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp4_ = _tmp3_.x;
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp5_ = book_view_get_x_offset (self);
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp6_ = *event;
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp7_ = _tmp6_.y;
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp10_ = book_view_get_page_at (self, (gint) (_tmp4_ + _tmp5_), (gint) _tmp7_, &_tmp8_, &_tmp9_);
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		x = _tmp8_;
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		y = _tmp9_;
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp11_ = _tmp10_;
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		book_view_select_page_view (self, _tmp11_);
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_page_view_unref0 (_tmp11_);
+#line 2880 "book-view.c"
 	}
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp12_ = self->priv->selected_page;
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp12_ == NULL) {
+#line 484 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		result = FALSE;
+#line 484 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return result;
+#line 2890 "book-view.c"
 	}
+#line 487 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp13_ = *event;
+#line 487 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp14_ = _tmp13_.button;
+#line 487 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp14_ == ((guint) 1)) {
+#line 2898 "book-view.c"
 		GdkEventButton _tmp15_;
 		GdkEventType _tmp16_;
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp15_ = *event;
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp16_ = _tmp15_.type;
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		if (_tmp16_ == GDK_BUTTON_PRESS) {
+#line 2907 "book-view.c"
 			PageView* _tmp17_;
 			gint _tmp18_;
 			gint _tmp19_;
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp17_ = self->priv->selected_page;
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp18_ = x;
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp19_ = y;
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			page_view_button_press (_tmp17_, _tmp18_, _tmp19_);
+#line 2919 "book-view.c"
 		} else {
 			GdkEventButton _tmp20_;
 			GdkEventType _tmp21_;
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp20_ = *event;
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp21_ = _tmp20_.type;
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			if (_tmp21_ == GDK_BUTTON_RELEASE) {
+#line 2929 "book-view.c"
 				PageView* _tmp22_;
 				gint _tmp23_;
 				gint _tmp24_;
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp22_ = self->priv->selected_page;
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp23_ = x;
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp24_ = y;
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				page_view_button_release (_tmp22_, _tmp23_, _tmp24_);
+#line 2941 "book-view.c"
 			} else {
 				GdkEventButton _tmp25_;
 				GdkEventType _tmp26_;
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp25_ = *event;
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp26_ = _tmp25_.type;
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (_tmp26_ == GDK_2BUTTON_PRESS) {
+#line 2951 "book-view.c"
 					Page* _tmp27_ = NULL;
 					Page* _tmp28_;
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp27_ = book_view_get_selected (self);
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp28_ = _tmp27_;
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					g_signal_emit_by_name (self, "show-page", _tmp28_);
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_page_unref0 (_tmp28_);
+#line 2962 "book-view.c"
 				}
 			}
 		}
 	}
+#line 498 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp29_ = *event;
+#line 498 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp30_ = _tmp29_.button;
+#line 498 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp30_ == ((guint) 3)) {
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		g_signal_emit_by_name (self, "show-menu");
+#line 2975 "book-view.c"
 	}
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	result = FALSE;
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
+#line 2981 "book-view.c"
 }
 
 
@@ -1924,24 +2991,43 @@ static void book_view_set_cursor (BookView* self, GdkCursorType cursor) {
 	GtkWidget* _tmp5_;
 	GdkWindow* _tmp6_ = NULL;
 	GdkCursor* _tmp7_;
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = self->priv->cursor;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = cursor;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp0_ == _tmp1_) {
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_g_object_unref0 (c);
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return;
+#line 3007 "book-view.c"
 	}
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp2_ = cursor;
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->cursor = _tmp2_;
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp3_ = cursor;
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp4_ = gdk_cursor_new (_tmp3_);
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_g_object_unref0 (c);
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	c = _tmp4_;
+#line 513 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp5_ = self->priv->drawing_area;
+#line 513 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp6_ = gtk_widget_get_window (_tmp5_);
+#line 513 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp7_ = c;
+#line 513 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	gdk_window_set_cursor (_tmp6_, _tmp7_);
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_g_object_unref0 (c);
+#line 3031 "book-view.c"
 }
 
 
@@ -1952,22 +3038,38 @@ static gboolean book_view_motion_cb (BookView* self, GtkWidget* widget, GdkEvent
 	PageView* _tmp1_;
 	gboolean _tmp4_;
 	GdkCursorType _tmp33_;
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	cursor = GDK_ARROW;
+#line 521 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = self->priv->selected_page;
+#line 521 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp1_ != NULL) {
+#line 3054 "book-view.c"
 		GdkEventMotion _tmp2_;
 		GdkModifierType _tmp3_;
+#line 521 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp2_ = *event;
+#line 521 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp3_ = _tmp2_.state;
+#line 521 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp0_ = (_tmp3_ & GDK_BUTTON1_MASK) != 0;
+#line 3063 "book-view.c"
 	} else {
+#line 521 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp0_ = FALSE;
+#line 3067 "book-view.c"
 	}
+#line 521 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp4_ = _tmp0_;
+#line 521 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp4_) {
+#line 3073 "book-view.c"
 		GdkEventMotion _tmp5_;
 		gdouble _tmp6_;
 		gint _tmp7_ = 0;
@@ -1984,24 +3086,43 @@ static gboolean book_view_motion_cb (BookView* self, GtkWidget* widget, GdkEvent
 		gint _tmp16_;
 		PageView* _tmp17_;
 		GdkCursorType _tmp18_ = 0;
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp5_ = *event;
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp6_ = _tmp5_.x;
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp7_ = book_view_get_x_offset (self);
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp8_ = self->priv->selected_page;
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp9_ = page_view_get_x_offset (_tmp8_);
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		x = (gint) ((_tmp6_ + _tmp7_) - _tmp9_);
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp10_ = *event;
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp11_ = _tmp10_.y;
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp12_ = self->priv->selected_page;
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp13_ = page_view_get_y_offset (_tmp12_);
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		y = (gint) (_tmp11_ - _tmp13_);
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp14_ = self->priv->selected_page;
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp15_ = x;
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp16_ = y;
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		page_view_motion (_tmp14_, _tmp15_, _tmp16_);
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp17_ = self->priv->selected_page;
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp18_ = page_view_get_cursor (_tmp17_);
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		cursor = _tmp18_;
+#line 3126 "book-view.c"
 	} else {
 		gint x = 0;
 		gint y = 0;
@@ -2015,36 +3136,63 @@ static gboolean book_view_motion_cb (BookView* self, GtkWidget* widget, GdkEvent
 		PageView* _tmp26_ = NULL;
 		PageView* over_page;
 		PageView* _tmp27_;
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp19_ = *event;
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp20_ = _tmp19_.x;
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp21_ = book_view_get_x_offset (self);
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp22_ = *event;
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp23_ = _tmp22_.y;
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp26_ = book_view_get_page_at (self, (gint) (_tmp20_ + _tmp21_), (gint) _tmp23_, &_tmp24_, &_tmp25_);
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		x = _tmp24_;
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		y = _tmp25_;
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		over_page = _tmp26_;
+#line 532 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp27_ = over_page;
+#line 532 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		if (_tmp27_ != NULL) {
+#line 3162 "book-view.c"
 			PageView* _tmp28_;
 			gint _tmp29_;
 			gint _tmp30_;
 			PageView* _tmp31_;
 			GdkCursorType _tmp32_ = 0;
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp28_ = over_page;
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp29_ = x;
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp30_ = y;
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			page_view_motion (_tmp28_, _tmp29_, _tmp30_);
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp31_ = over_page;
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp32_ = page_view_get_cursor (_tmp31_);
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			cursor = _tmp32_;
+#line 3182 "book-view.c"
 		}
+#line 521 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_page_view_unref0 (over_page);
+#line 3186 "book-view.c"
 	}
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp33_ = cursor;
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_set_cursor (self, _tmp33_);
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	result = FALSE;
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
+#line 3196 "book-view.c"
 }
 
 
@@ -2052,72 +3200,123 @@ static gboolean book_view_key_cb (BookView* self, GtkWidget* widget, GdkEventKey
 	gboolean result = FALSE;
 	GdkEventKey _tmp0_;
 	guint _tmp1_;
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = *event;
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = _tmp0_.keyval;
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	switch (_tmp1_) {
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		case 0xff50:
+#line 3218 "book-view.c"
 		{
 			Book* _tmp2_;
 			Page* _tmp3_ = NULL;
 			Page* _tmp4_;
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp2_ = self->priv->book;
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp3_ = book_get_page (_tmp2_, 0);
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp4_ = _tmp3_;
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			book_view_select_page (self, _tmp4_);
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_page_unref0 (_tmp4_);
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			result = TRUE;
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			return result;
+#line 3237 "book-view.c"
 		}
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		case 0xff51:
+#line 3241 "book-view.c"
 		{
 			PageView* _tmp5_;
 			PageView* _tmp6_ = NULL;
 			PageView* _tmp7_;
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp5_ = self->priv->selected_page;
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp6_ = book_view_get_prev_page (self, _tmp5_);
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp7_ = _tmp6_;
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			book_view_select_page_view (self, _tmp7_);
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_page_view_unref0 (_tmp7_);
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			result = TRUE;
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			return result;
+#line 3260 "book-view.c"
 		}
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		case 0xff53:
+#line 3264 "book-view.c"
 		{
 			PageView* _tmp8_;
 			PageView* _tmp9_ = NULL;
 			PageView* _tmp10_;
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp8_ = self->priv->selected_page;
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp9_ = book_view_get_next_page (self, _tmp8_);
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp10_ = _tmp9_;
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			book_view_select_page_view (self, _tmp10_);
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_page_view_unref0 (_tmp10_);
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			result = TRUE;
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			return result;
+#line 3283 "book-view.c"
 		}
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		case 0xFF57:
+#line 3287 "book-view.c"
 		{
 			Book* _tmp11_;
 			Book* _tmp12_;
 			guint _tmp13_ = 0U;
 			Page* _tmp14_ = NULL;
 			Page* _tmp15_;
+#line 558 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp11_ = self->priv->book;
+#line 558 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp12_ = self->priv->book;
+#line 558 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp13_ = book_get_n_pages (_tmp12_);
+#line 558 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp14_ = book_get_page (_tmp11_, ((gint) _tmp13_) - 1);
+#line 558 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp15_ = _tmp14_;
+#line 558 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			book_view_select_page (self, _tmp15_);
+#line 558 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_page_unref0 (_tmp15_);
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			result = TRUE;
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			return result;
+#line 3312 "book-view.c"
 		}
 		default:
 		{
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			result = FALSE;
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			return result;
+#line 3320 "book-view.c"
 		}
 	}
 }
@@ -2126,32 +3325,50 @@ static gboolean book_view_key_cb (BookView* self, GtkWidget* widget, GdkEventKey
 static gboolean book_view_focus_cb (BookView* self, GtkWidget* widget, GdkEventFocus* event) {
 	gboolean result = FALSE;
 	PageView* _tmp0_;
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = self->priv->selected_page;
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_set_selected_page (self, _tmp0_);
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	result = FALSE;
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
+#line 3343 "book-view.c"
 }
 
 
 static void book_view_scroll_cb (BookView* self, GtkAdjustment* adjustment) {
 	gboolean _tmp0_;
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (adjustment != NULL);
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = self->priv->laying_out;
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (!_tmp0_) {
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		book_view_redraw (self);
+#line 3359 "book-view.c"
 	}
 }
 
 
 void book_view_redraw (BookView* self) {
 	GtkWidget* _tmp0_;
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = self->priv->drawing_area;
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	gtk_widget_queue_draw (_tmp0_);
+#line 3372 "book-view.c"
 }
 
 
@@ -2161,26 +3378,45 @@ void book_view_select_page (BookView* self, Page* page) {
 	Page* _tmp2_;
 	gboolean _tmp3_;
 	Page* _tmp4_;
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = book_view_get_selected (self);
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = _tmp0_;
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp2_ = page;
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp3_ = _tmp1_ == _tmp2_;
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_unref0 (_tmp1_);
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp3_) {
+#line 586 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return;
+#line 3398 "book-view.c"
 	}
+#line 588 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp4_ = page;
+#line 588 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp4_ != NULL) {
+#line 3404 "book-view.c"
 		GHashTable* _tmp5_;
 		Page* _tmp6_;
 		gconstpointer _tmp7_ = NULL;
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp5_ = self->priv->page_data;
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp6_ = page;
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp7_ = g_hash_table_lookup (_tmp5_, _tmp6_);
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		book_view_select_page_view (self, (PageView*) _tmp7_);
+#line 3416 "book-view.c"
 	} else {
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		book_view_select_page_view (self, NULL);
+#line 3420 "book-view.c"
 	}
 }
 
@@ -2189,12 +3425,19 @@ void book_view_select_next_page (BookView* self) {
 	PageView* _tmp0_;
 	PageView* _tmp1_ = NULL;
 	PageView* _tmp2_;
+#line 594 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = self->priv->selected_page;
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = book_view_get_next_page (self, _tmp0_);
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp2_ = _tmp1_;
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_select_page_view (self, _tmp2_);
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_view_unref0 (_tmp2_);
+#line 3441 "book-view.c"
 }
 
 
@@ -2202,30 +3445,49 @@ void book_view_select_prev_page (BookView* self) {
 	PageView* _tmp0_;
 	PageView* _tmp1_ = NULL;
 	PageView* _tmp2_;
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = self->priv->selected_page;
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = book_view_get_prev_page (self, _tmp0_);
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp2_ = _tmp1_;
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_select_page_view (self, _tmp2_);
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_view_unref0 (_tmp2_);
+#line 3461 "book-view.c"
 }
 
 
 Page* book_view_get_selected (BookView* self) {
 	Page* result = NULL;
 	PageView* _tmp0_;
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (self != NULL, NULL);
+#line 606 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = self->priv->selected_page;
+#line 606 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp0_ != NULL) {
+#line 3474 "book-view.c"
 		PageView* _tmp1_;
 		Page* _tmp2_ = NULL;
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp1_ = self->priv->selected_page;
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp2_ = page_view_get_page (_tmp1_);
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		result = _tmp2_;
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return result;
+#line 3485 "book-view.c"
 	} else {
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		result = NULL;
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return result;
+#line 3491 "book-view.c"
 	}
 }
 
@@ -2237,32 +3499,53 @@ static void g_cclosure_user_marshal_VOID__PAGE (GClosure * closure, GValue * ret
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (n_param_values == 2);
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		data1 = closure->data;
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		data2 = param_values->data[0].v_pointer;
+#line 3511 "book-view.c"
 	} else {
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		data1 = param_values->data[0].v_pointer;
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		data2 = closure->data;
+#line 3517 "book-view.c"
 	}
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	callback = (GMarshalFunc_VOID__PAGE) (marshal_data ? marshal_data : cc->callback);
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	callback (data1, value_get_page (param_values + 1), data2);
+#line 3523 "book-view.c"
 }
 
 
 static void book_view_class_init (BookViewClass * klass) {
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_parent_class = g_type_class_peek_parent (klass);
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_type_class_add_private (klass, sizeof (BookViewPrivate));
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	G_OBJECT_CLASS (klass)->finalize = book_view_finalize;
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_new ("page_selected", TYPE_BOOK_VIEW, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__PAGE, G_TYPE_NONE, 1, TYPE_PAGE);
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_new ("show_page", TYPE_BOOK_VIEW, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__PAGE, G_TYPE_NONE, 1, TYPE_PAGE);
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_new ("show_menu", TYPE_BOOK_VIEW, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 3540 "book-view.c"
 }
 
 
 static void book_view_instance_init (BookView * self) {
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv = BOOK_VIEW_GET_PRIVATE (self);
+#line 27 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->selected_page = NULL;
+#line 3549 "book-view.c"
 }
 
 
@@ -2294,53 +3577,101 @@ static void book_view_finalize (GObject* obj) {
 	guint _tmp23_ = 0U;
 	GtkAdjustment* _tmp24_;
 	guint _tmp25_ = 0U;
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BOOK_VIEW, BookView);
+#line 90 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = self->priv->book;
+#line 90 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("page-added", TYPE_BOOK, &_tmp1_, NULL, FALSE);
+#line 90 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _book_view_add_cb_book_page_added, self);
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp2_ = self->priv->book;
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("page-removed", TYPE_BOOK, &_tmp3_, NULL, FALSE);
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _book_view_remove_cb_book_page_removed, self);
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp4_ = self->priv->book;
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("reordered", TYPE_BOOK, &_tmp5_, NULL, FALSE);
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _book_view_reorder_cb_book_reordered, self);
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp6_ = self->priv->book;
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("cleared", TYPE_BOOK, &_tmp7_, NULL, FALSE);
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _book_view_clear_cb_book_cleared, self);
+#line 94 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp8_ = self->priv->drawing_area;
+#line 94 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("configure-event", GTK_TYPE_WIDGET, &_tmp9_, NULL, FALSE);
+#line 94 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp8_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _book_view_configure_cb_gtk_widget_configure_event, self);
+#line 95 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp10_ = self->priv->drawing_area;
+#line 95 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("draw", GTK_TYPE_WIDGET, &_tmp11_, NULL, FALSE);
+#line 95 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _book_view_draw_cb_gtk_widget_draw, self);
+#line 96 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp12_ = self->priv->drawing_area;
+#line 96 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("motion-notify-event", GTK_TYPE_WIDGET, &_tmp13_, NULL, FALSE);
+#line 96 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp12_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _book_view_motion_cb_gtk_widget_motion_notify_event, self);
+#line 97 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp14_ = self->priv->drawing_area;
+#line 97 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("key-press-event", GTK_TYPE_WIDGET, &_tmp15_, NULL, FALSE);
+#line 97 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp14_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp15_, 0, NULL, (GCallback) _book_view_key_cb_gtk_widget_key_press_event, self);
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp16_ = self->priv->drawing_area;
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("button-press-event", GTK_TYPE_WIDGET, &_tmp17_, NULL, FALSE);
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp16_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp17_, 0, NULL, (GCallback) _book_view_button_cb_gtk_widget_button_press_event, self);
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp18_ = self->priv->drawing_area;
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("button-release-event", GTK_TYPE_WIDGET, &_tmp19_, NULL, FALSE);
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp18_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp19_, 0, NULL, (GCallback) _book_view_button_cb_gtk_widget_button_release_event, self);
+#line 100 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp20_ = self->priv->drawing_area;
+#line 100 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("focus-in-event", GTK_TYPE_WIDGET, &_tmp21_, NULL, FALSE);
+#line 100 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp20_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp21_, 0, NULL, (GCallback) _book_view_focus_cb_gtk_widget_focus_in_event, self);
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp22_ = self->priv->drawing_area;
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("focus-out-event", GTK_TYPE_WIDGET, &_tmp23_, NULL, FALSE);
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp22_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp23_, 0, NULL, (GCallback) _book_view_focus_cb_gtk_widget_focus_out_event, self);
+#line 102 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp24_ = self->priv->adjustment;
+#line 102 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("value-changed", GTK_TYPE_ADJUSTMENT, &_tmp25_, NULL, FALSE);
+#line 102 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp24_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp25_, 0, NULL, (GCallback) _book_view_scroll_cb_gtk_adjustment_value_changed, self);
+#line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_book_unref0 (self->priv->book);
+#line 19 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_g_hash_table_unref0 (self->priv->page_data);
+#line 27 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_view_unref0 (self->priv->selected_page);
+#line 30 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_g_object_unref0 (self->priv->drawing_area);
+#line 33 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_g_object_unref0 (self->priv->scroll);
+#line 34 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_g_object_unref0 (self->priv->adjustment);
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	G_OBJECT_CLASS (book_view_parent_class)->finalize (obj);
+#line 3675 "book-view.c"
 }
 
 
diff --git a/src/book.c b/src/book.c
index 9d868ef..b9e4dbb 100644
--- a/src/book.c
+++ b/src/book.c
@@ -1,4 +1,4 @@
-/* book.c generated by valac 0.18.1, the Vala compiler
+/* book.c generated by valac 0.20.1, the Vala compiler
  * generated from book.vala, do not modify */
 
 /*
@@ -24,8 +24,6 @@
 #include <gdk/gdk.h>
 #include <cairo-ps.h>
 #include <zlib.h>
-#include "jpeglib.h"
-#include "config.h"
 #include <gobject/gvaluecollector.h>
 
 
@@ -51,6 +49,7 @@ typedef struct _Page Page;
 typedef struct _PageClass PageClass;
 #define _page_unref0(var) ((var == NULL) ? NULL : (var = (page_unref (var), NULL)))
 #define __g_list_free__page_unref0_0(var) ((var == NULL) ? NULL : (var = (_g_list_free__page_unref0_ (var), NULL)))
+#define _g_byte_array_unref0(var) ((var == NULL) ? NULL : (var = (g_byte_array_unref (var), NULL)))
 
 #define TYPE_SCAN_DIRECTION (scan_direction_get_type ())
 #define _g_free0(var) (var = (g_free (var), NULL))
@@ -69,6 +68,7 @@ typedef struct _PsWriterClass PsWriterClass;
 typedef struct _PsWriterPrivate PsWriterPrivate;
 #define _cairo_surface_destroy0(var) ((var == NULL) ? NULL : (var = (cairo_surface_destroy (var), NULL)))
 #define _ps_writer_unref0(var) ((var == NULL) ? NULL : (var = (ps_writer_unref (var), NULL)))
+#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 
 #define TYPE_PDF_WRITER (pdf_writer_get_type ())
 #define PDF_WRITER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PDF_WRITER, PDFWriter))
@@ -83,7 +83,6 @@ typedef struct _PDFWriterPrivate PDFWriterPrivate;
 #define _pdf_writer_unref0(var) ((var == NULL) ? NULL : (var = (pdf_writer_unref (var), NULL)))
 typedef struct _ParamSpecBook ParamSpecBook;
 #define _g_list_free0(var) ((var == NULL) ? NULL : (var = (g_list_free (var), NULL)))
-#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 typedef struct _ParamSpecPDFWriter ParamSpecPDFWriter;
 typedef struct _ParamSpecPsWriter ParamSpecPsWriter;
 
@@ -101,6 +100,7 @@ struct _BookClass {
 struct _BookPrivate {
 	GList* pages;
 	gboolean needs_saving;
+	GByteArray* jpeg_data;
 };
 
 typedef enum  {
@@ -194,8 +194,8 @@ guint book_get_n_pages (Book* self);
 Page* book_get_page (Book* self, gint page_number);
 guint book_get_page_index (Book* self, Page* page);
 static GFile* book_make_indexed_file (Book* self, const gchar* uri, gint i);
-static void book_save_multi_file (Book* self, const gchar* type, GFile* file, GError** error);
-void page_save (Page* self, const gchar* type, GFile* file, GError** error);
+static void book_save_multi_file (Book* self, const gchar* type, gint quality, GFile* file, GError** error);
+void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError** error);
 static void book_save_ps_pdf_surface (Book* self, cairo_surface_t* surface, GdkPixbuf* image, gdouble dpi);
 static void book_save_ps (Book* self, GFile* file, GError** error);
 PsWriter* ps_writer_new (GFileOutputStream* stream);
@@ -210,14 +210,10 @@ GType ps_writer_get_type (void) G_GNUC_CONST;
 GdkPixbuf* page_get_image (Page* self, gboolean apply_crop);
 gint page_get_dpi (Page* self);
 static guint8* book_compress_zlib (Book* self, guint8* data, int data_length1, int* result_length1);
-static void book_jpeg_init_cb (struct jpeg_compress_struct* info);
-static gboolean book_jpeg_empty_cb (struct jpeg_compress_struct* info);
-static void book_jpeg_term_cb (struct jpeg_compress_struct* info);
-static guint8* book_compress_jpeg (Book* self, GdkPixbuf* image, gsize* n_written, int* result_length1);
-static void _book_jpeg_init_cb_jpeg_initdestinationfunc (struct jpeg_compress_struct* cinfo);
-static gboolean _book_jpeg_empty_cb_jpeg_emptyoutputbufferfunc (struct jpeg_compress_struct* cinfo);
-static void _book_jpeg_term_cb_jpeg_termdestinationfunc (struct jpeg_compress_struct* cinfo);
-static void book_save_pdf (Book* self, GFile* file, GError** error);
+static guint8* book_compress_jpeg (Book* self, GdkPixbuf* image, gint quality, gint dpi, int* result_length1);
+static gboolean book_write_pixbuf_data (Book* self, guint8* buf, int buf_length1, GError** error);
+static gboolean _book_write_pixbuf_data_gdk_pixbuf_save_func (guint8* buf, gsize buf_length1, GError** error, gpointer self);
+static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error);
 PDFWriter* pdf_writer_new (GFileOutputStream* stream);
 PDFWriter* pdf_writer_construct (GType object_type, GFileOutputStream* stream);
 gpointer pdf_writer_ref (gpointer instance);
@@ -234,7 +230,7 @@ gint page_get_depth (Page* self);
 static guint8* _vala_array_dup1 (guint8* self, int length);
 static guint8* _vala_array_dup2 (guint8* self, int length);
 void pdf_writer_write (PDFWriter* self, guint8* data, int data_length1);
-void book_save (Book* self, const gchar* type, GFile* file, GError** error);
+void book_save (Book* self, const gchar* type, gint quality, GFile* file, GError** error);
 gboolean book_get_needs_saving (Book* self);
 static void g_cclosure_user_marshal_VOID__PAGE (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
 static void book_finalize (Book* obj);
@@ -249,86 +245,131 @@ enum  {
 static cairo_status_t ps_writer_write_cairo_data (PsWriter* self, guint8* data, int data_length1);
 static cairo_status_t _ps_writer_write_cairo_data_cairo_write_func_t (gpointer self, guchar* data, int data_length1);
 static void ps_writer_finalize (PsWriter* obj);
+static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
+static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
 
 static gpointer _page_ref0 (gpointer self) {
+#line 32 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return self ? page_ref (self) : NULL;
+#line 256 "book.c"
 }
 
 
 static void _book_page_changed_cb_page_pixels_changed (Page* _sender, gpointer self) {
+#line 34 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	book_page_changed_cb (self, _sender);
+#line 263 "book.c"
 }
 
 
 static void _book_page_changed_cb_page_crop_changed (Page* _sender, gpointer self) {
+#line 35 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	book_page_changed_cb (self, _sender);
+#line 270 "book.c"
 }
 
 
 static void _page_unref0_ (gpointer var) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	(var == NULL) ? NULL : (var = (page_unref (var), NULL));
+#line 277 "book.c"
 }
 
 
 static void _g_list_free__page_unref0_ (GList* self) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_list_foreach (self, (GFunc) _page_unref0_, NULL);
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_list_free (self);
+#line 286 "book.c"
 }
 
 
 Book* book_construct (GType object_type) {
 	Book* self = NULL;
+#line 25 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self = (Book*) g_type_create_instance (object_type);
+#line 27 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	__g_list_free__page_unref0_0 (self->priv->pages);
+#line 27 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->priv->pages = NULL;
+#line 25 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return self;
+#line 300 "book.c"
 }
 
 
 Book* book_new (void) {
+#line 25 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return book_construct (TYPE_BOOK);
+#line 307 "book.c"
 }
 
 
 void book_clear (Book* self) {
 	GList* _tmp0_;
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = self->priv->pages;
+#line 317 "book.c"
 	{
 		GList* page_collection = NULL;
 		GList* page_it = NULL;
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		page_collection = _tmp0_;
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		for (page_it = page_collection; page_it != NULL; page_it = page_it->next) {
+#line 325 "book.c"
 			Page* _tmp1_;
 			Page* page = NULL;
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			_tmp1_ = _page_ref0 ((Page*) page_it->data);
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			page = _tmp1_;
+#line 332 "book.c"
 			{
 				Page* _tmp2_;
 				guint _tmp3_ = 0U;
 				Page* _tmp4_;
 				guint _tmp5_ = 0U;
+#line 43 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp2_ = page;
+#line 43 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				g_signal_parse_name ("pixels-changed", TYPE_PAGE, &_tmp3_, NULL, FALSE);
+#line 43 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _book_page_changed_cb_page_pixels_changed, self);
+#line 44 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp4_ = page;
+#line 44 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				g_signal_parse_name ("crop-changed", TYPE_PAGE, &_tmp5_, NULL, FALSE);
+#line 44 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _book_page_changed_cb_page_crop_changed, self);
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_page_unref0 (page);
+#line 352 "book.c"
 			}
 		}
 	}
+#line 46 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	__g_list_free__page_unref0_0 (self->priv->pages);
+#line 46 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->priv->pages = NULL;
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_emit_by_name (self, "cleared");
+#line 362 "book.c"
 }
 
 
 static void book_page_changed_cb (Book* self, Page* page) {
+#line 50 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
+#line 50 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (page != NULL);
+#line 52 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	book_set_needs_saving (self, TRUE);
+#line 373 "book.c"
 }
 
 
@@ -341,21 +382,37 @@ Page* book_append_page (Book* self, gint width, gint height, gint dpi, ScanDirec
 	Page* _tmp4_;
 	Page* page;
 	Page* _tmp5_;
+#line 55 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (self != NULL, NULL);
+#line 57 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = width;
+#line 57 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = height;
+#line 57 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = dpi;
+#line 57 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3_ = scan_direction;
+#line 57 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp4_ = page_new (_tmp0_, _tmp1_, _tmp2_, _tmp3_);
+#line 57 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	page = _tmp4_;
+#line 58 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_connect (page, "pixels-changed", (GCallback) _book_page_changed_cb_page_pixels_changed, self);
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_connect (page, "crop-changed", (GCallback) _book_page_changed_cb_page_crop_changed, self);
+#line 61 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_ = _page_ref0 (page);
+#line 61 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->priv->pages = g_list_append (self->priv->pages, _tmp5_);
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_emit_by_name (self, "page-added", page);
+#line 63 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	book_set_needs_saving (self, TRUE);
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	result = page;
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
+#line 416 "book.c"
 }
 
 
@@ -364,16 +421,27 @@ void book_move_page (Book* self, Page* page, guint location) {
 	Page* _tmp1_;
 	Page* _tmp2_;
 	guint _tmp3_;
+#line 68 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
+#line 68 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (page != NULL);
+#line 70 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = page;
+#line 70 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->priv->pages = g_list_remove (self->priv->pages, _tmp0_);
+#line 71 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = page;
+#line 71 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = _page_ref0 (_tmp1_);
+#line 71 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3_ = location;
+#line 71 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->priv->pages = g_list_insert (self->priv->pages, _tmp2_, (gint) _tmp3_);
+#line 72 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_emit_by_name (self, "reordered");
+#line 73 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	book_set_needs_saving (self, TRUE);
+#line 445 "book.c"
 }
 
 
@@ -384,19 +452,33 @@ void book_delete_page (Book* self, Page* page) {
 	guint _tmp3_ = 0U;
 	Page* _tmp4_;
 	Page* _tmp5_;
+#line 76 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
+#line 76 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (page != NULL);
+#line 78 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = page;
+#line 78 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_parse_name ("pixels-changed", TYPE_PAGE, &_tmp1_, NULL, FALSE);
+#line 78 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _book_page_changed_cb_page_pixels_changed, self);
+#line 79 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = page;
+#line 79 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_parse_name ("crop-changed", TYPE_PAGE, &_tmp3_, NULL, FALSE);
+#line 79 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _book_page_changed_cb_page_crop_changed, self);
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp4_ = page;
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_emit_by_name (self, "page-removed", _tmp4_);
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_ = page;
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->priv->pages = g_list_remove (self->priv->pages, _tmp5_);
+#line 82 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	book_set_needs_saving (self, TRUE);
+#line 482 "book.c"
 }
 
 
@@ -404,11 +486,17 @@ guint book_get_n_pages (Book* self) {
 	guint result = 0U;
 	GList* _tmp0_;
 	guint _tmp1_ = 0U;
+#line 85 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (self != NULL, 0U);
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = self->priv->pages;
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = g_list_length (_tmp0_);
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	result = _tmp1_;
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
+#line 500 "book.c"
 }
 
 
@@ -419,23 +507,39 @@ Page* book_get_page (Book* self, gint page_number) {
 	gint _tmp5_;
 	gconstpointer _tmp6_ = NULL;
 	Page* _tmp7_;
+#line 90 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (self != NULL, NULL);
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = page_number;
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (_tmp0_ < 0) {
+#line 517 "book.c"
 		GList* _tmp1_;
 		guint _tmp2_ = 0U;
 		gint _tmp3_;
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp1_ = self->priv->pages;
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp2_ = g_list_length (_tmp1_);
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp3_ = page_number;
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		page_number = ((gint) _tmp2_) + _tmp3_;
+#line 529 "book.c"
 	}
+#line 94 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp4_ = self->priv->pages;
+#line 94 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_ = page_number;
+#line 94 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp6_ = g_list_nth_data (_tmp4_, (guint) _tmp5_);
+#line 94 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp7_ = _page_ref0 ((Page*) _tmp6_);
+#line 94 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	result = _tmp7_;
+#line 94 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
+#line 543 "book.c"
 }
 
 
@@ -444,13 +548,21 @@ guint book_get_page_index (Book* self, Page* page) {
 	GList* _tmp0_;
 	Page* _tmp1_;
 	gint _tmp2_ = 0;
+#line 97 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (self != NULL, 0U);
+#line 97 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (page != NULL, 0U);
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = self->priv->pages;
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = page;
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = g_list_index (_tmp0_, _tmp1_);
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	result = (guint) _tmp2_;
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
+#line 566 "book.c"
 }
 
 
@@ -461,20 +573,35 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start
 	gchar* _tmp2_ = NULL;
 	gchar* _result_;
 	gchar* _tmp3_;
+#line 928 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
+#line 929 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
+#line 929 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp1_ = c;
+#line 929 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) (-1), _tmp1_);
+#line 929 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
+#line 931 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
+#line 931 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
+#line 591 "book.c"
 		gchar* _tmp4_;
+#line 932 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
+#line 932 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
+#line 932 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		return result;
+#line 599 "book.c"
 	} else {
+#line 934 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		result = -1;
+#line 934 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		return result;
+#line 605 "book.c"
 	}
 }
 
@@ -498,59 +625,109 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	glong _tmp21_;
 	glong _tmp22_;
 	gchar* _tmp23_ = NULL;
+#line 1190 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
+#line 1191 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
+#line 1191 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
+#line 1191 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	string_length = (glong) _tmp1_;
+#line 1192 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp2_ = start;
+#line 1192 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
+#line 641 "book.c"
 		glong _tmp3_;
 		glong _tmp4_;
+#line 1193 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp3_ = string_length;
+#line 1193 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp4_ = start;
+#line 1193 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
+#line 650 "book.c"
 	}
+#line 1195 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
+#line 1195 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
+#line 656 "book.c"
 		glong _tmp6_;
 		glong _tmp7_;
+#line 1196 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp6_ = string_length;
+#line 1196 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp7_ = end;
+#line 1196 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
+#line 665 "book.c"
 	}
+#line 1198 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
+#line 1198 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
+#line 671 "book.c"
 		glong _tmp10_;
 		glong _tmp11_;
+#line 1198 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp10_ = start;
+#line 1198 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp11_ = string_length;
+#line 1198 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
+#line 680 "book.c"
 	} else {
+#line 1198 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
+#line 684 "book.c"
 	}
+#line 1198 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp12_ = _tmp8_;
+#line 1198 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
+#line 1199 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp14_ = end;
+#line 1199 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	if (_tmp14_ >= ((glong) 0)) {
+#line 694 "book.c"
 		glong _tmp15_;
 		glong _tmp16_;
+#line 1199 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp15_ = end;
+#line 1199 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp16_ = string_length;
+#line 1199 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp13_ = _tmp15_ <= _tmp16_;
+#line 703 "book.c"
 	} else {
+#line 1199 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp13_ = FALSE;
+#line 707 "book.c"
 	}
+#line 1199 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp17_ = _tmp13_;
+#line 1199 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp17_, NULL);
+#line 1200 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp18_ = start;
+#line 1200 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp19_ = end;
+#line 1200 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp18_ <= _tmp19_, NULL);
+#line 1201 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp20_ = start;
+#line 1201 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp21_ = end;
+#line 1201 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp22_ = start;
+#line 1201 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp23_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) (_tmp21_ - _tmp22_));
+#line 1201 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	result = _tmp23_;
+#line 1201 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	return result;
+#line 731 "book.c"
 }
 
 
@@ -569,37 +746,79 @@ static GFile* book_make_indexed_file (Book* self, const gchar* uri, gint i) {
 	gint _tmp9_ = 0;
 	gint extension_index;
 	gint _tmp10_;
-	const gchar* _tmp25_;
-	gint _tmp26_;
-	const gchar* _tmp27_;
-	gchar* _tmp28_ = NULL;
-	gchar* _tmp29_;
-	GFile* _tmp30_ = NULL;
-	GFile* _tmp31_;
+	guint _tmp25_ = 0U;
+	gchar* _tmp26_ = NULL;
+	gchar* _tmp27_;
+	gint _tmp28_;
+	gint _tmp29_;
+	gint _tmp30_;
+	gint width;
+	gint _tmp31_;
+	gchar* _tmp32_ = NULL;
+	gchar* number_format;
+	const gchar* _tmp33_;
+	gchar* _tmp34_;
+	gchar* _tmp35_;
+	const gchar* _tmp36_;
+	gint _tmp37_;
+	gchar* _tmp38_ = NULL;
+	gchar* _tmp39_;
+	gchar* _tmp40_;
+	gchar* _tmp41_;
+	const gchar* _tmp42_;
+	gchar* _tmp43_;
+	gchar* _tmp44_;
+	gchar* filename;
+	const gchar* _tmp45_;
+	GFile* _tmp46_ = NULL;
+#line 102 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (self != NULL, NULL);
+#line 102 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (uri != NULL, NULL);
+#line 104 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = book_get_n_pages (self);
+#line 104 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (_tmp0_ == ((guint) 1)) {
+#line 783 "book.c"
 		const gchar* _tmp1_;
 		GFile* _tmp2_ = NULL;
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp1_ = uri;
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp2_ = g_file_new_for_uri (_tmp1_);
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		result = _tmp2_;
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return result;
+#line 794 "book.c"
 	}
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3_ = uri;
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp4_ = g_path_get_basename (_tmp3_);
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	basename = _tmp4_;
+#line 109 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_ = uri;
+#line 109 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp6_ = g_strdup (_tmp5_);
+#line 109 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	prefix = _tmp6_;
+#line 109 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp7_ = g_strdup ("");
+#line 109 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	suffix = _tmp7_;
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp8_ = basename;
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp9_ = string_last_index_of_char (_tmp8_, (gunichar) '.', 0);
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	extension_index = _tmp9_;
+#line 111 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp10_ = extension_index;
+#line 111 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (_tmp10_ >= 0) {
+#line 822 "book.c"
 		const gchar* _tmp11_;
 		gint _tmp12_;
 		const gchar* _tmp13_;
@@ -614,53 +833,141 @@ static GFile* book_make_indexed_file (Book* self, const gchar* uri, gint i) {
 		gint _tmp22_;
 		gint _tmp23_;
 		gchar* _tmp24_ = NULL;
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp11_ = basename;
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp12_ = extension_index;
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp13_ = basename;
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp14_ = strlen (_tmp13_);
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp15_ = _tmp14_;
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp16_ = string_slice (_tmp11_, (glong) _tmp12_, (glong) _tmp15_);
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_g_free0 (suffix);
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		suffix = _tmp16_;
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp17_ = uri;
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp18_ = uri;
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp19_ = strlen (_tmp18_);
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp20_ = _tmp19_;
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp21_ = suffix;
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp22_ = strlen (_tmp21_);
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp23_ = _tmp22_;
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp24_ = string_slice (_tmp17_, (glong) 0, (glong) (_tmp20_ - _tmp23_));
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_g_free0 (prefix);
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		prefix = _tmp24_;
+#line 873 "book.c"
 	}
-	_tmp25_ = prefix;
-	_tmp26_ = i;
-	_tmp27_ = suffix;
-	_tmp28_ = g_strdup_printf ("%s-%d%s", _tmp25_, _tmp26_ + 1, _tmp27_);
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp25_ = book_get_n_pages (self);
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp26_ = g_strdup_printf ("%u", _tmp25_);
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp27_ = _tmp26_;
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp28_ = strlen (_tmp27_);
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp29_ = _tmp28_;
-	_tmp30_ = g_file_new_for_uri (_tmp29_);
-	_tmp31_ = _tmp30_;
-	_g_free0 (_tmp29_);
-	result = _tmp31_;
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp30_ = _tmp29_;
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_free0 (_tmp27_);
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	width = _tmp30_;
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp31_ = width;
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp32_ = g_strdup_printf ("%%0%dd", _tmp31_);
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	number_format = _tmp32_;
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp33_ = prefix;
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp34_ = g_strconcat (_tmp33_, "-", NULL);
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp35_ = _tmp34_;
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp36_ = number_format;
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp37_ = i;
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp38_ = g_strdup_printf (_tmp36_, _tmp37_ + 1);
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp39_ = _tmp38_;
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp40_ = g_strconcat (_tmp35_, _tmp39_, NULL);
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp41_ = _tmp40_;
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp42_ = suffix;
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp43_ = g_strconcat (_tmp41_, _tmp42_, NULL);
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp44_ = _tmp43_;
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_free0 (_tmp41_);
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_free0 (_tmp39_);
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_free0 (_tmp35_);
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	filename = _tmp44_;
+#line 119 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp45_ = filename;
+#line 119 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp46_ = g_file_new_for_uri (_tmp45_);
+#line 119 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	result = _tmp46_;
+#line 119 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_free0 (filename);
+#line 119 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_free0 (number_format);
+#line 119 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_free0 (suffix);
+#line 119 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_free0 (prefix);
+#line 119 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_free0 (basename);
+#line 119 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
+#line 947 "book.c"
 }
 
 
-static void book_save_multi_file (Book* self, const gchar* type, GFile* file, GError** error) {
+static void book_save_multi_file (Book* self, const gchar* type, gint quality, GFile* file, GError** error) {
 	GError * _inner_error_ = NULL;
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (type != NULL);
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (file != NULL);
+#line 959 "book.c"
 	{
 		gint i;
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		i = 0;
+#line 964 "book.c"
 		{
 			gboolean _tmp0_;
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			_tmp0_ = TRUE;
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			while (TRUE) {
+#line 971 "book.c"
 				gboolean _tmp1_;
 				gint _tmp3_;
 				guint _tmp4_ = 0U;
@@ -669,47 +976,85 @@ static void book_save_multi_file (Book* self, const gchar* type, GFile* file, GE
 				Page* page;
 				Page* _tmp7_;
 				const gchar* _tmp8_;
-				GFile* _tmp9_;
-				gchar* _tmp10_ = NULL;
-				gchar* _tmp11_;
-				gint _tmp12_;
-				GFile* _tmp13_ = NULL;
-				GFile* _tmp14_;
-				gint _tmp15_;
+				gint _tmp9_;
+				GFile* _tmp10_;
+				gchar* _tmp11_ = NULL;
+				gchar* _tmp12_;
+				gint _tmp13_;
+				GFile* _tmp14_ = NULL;
+				GFile* _tmp15_;
+				gint _tmp16_;
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp1_ = _tmp0_;
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (!_tmp1_) {
+#line 992 "book.c"
 					gint _tmp2_;
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp2_ = i;
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					i = _tmp2_ + 1;
+#line 998 "book.c"
 				}
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp0_ = FALSE;
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp3_ = i;
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp4_ = book_get_n_pages (self);
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (!(((guint) _tmp3_) < _tmp4_)) {
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					break;
+#line 1010 "book.c"
 				}
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp5_ = i;
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp6_ = book_get_page (self, _tmp5_);
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				page = _tmp6_;
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp7_ = page;
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp8_ = type;
-				_tmp9_ = file;
-				_tmp10_ = g_file_get_uri (_tmp9_);
-				_tmp11_ = _tmp10_;
-				_tmp12_ = i;
-				_tmp13_ = book_make_indexed_file (self, _tmp11_, _tmp12_);
-				_tmp14_ = _tmp13_;
-				page_save (_tmp7_, _tmp8_, _tmp14_, &_inner_error_);
-				_g_object_unref0 (_tmp14_);
-				_g_free0 (_tmp11_);
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp9_ = quality;
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp10_ = file;
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp11_ = g_file_get_uri (_tmp10_);
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp12_ = _tmp11_;
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp13_ = i;
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp14_ = book_make_indexed_file (self, _tmp12_, _tmp13_);
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp15_ = _tmp14_;
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				page_save (_tmp7_, _tmp8_, _tmp9_, _tmp15_, &_inner_error_);
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_object_unref0 (_tmp15_);
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_free0 (_tmp12_);
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (_inner_error_ != NULL) {
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					g_propagate_error (error, _inner_error_);
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_page_unref0 (page);
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					return;
+#line 1050 "book.c"
 				}
-				_tmp15_ = i;
-				g_signal_emit_by_name (self, "saving", _tmp15_);
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp16_ = i;
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				g_signal_emit_by_name (self, "saving", _tmp16_);
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_page_unref0 (page);
+#line 1058 "book.c"
 			}
 		}
 	}
@@ -724,26 +1069,44 @@ static void book_save_ps_pdf_surface (Book* self, cairo_surface_t* surface, GdkP
 	gdouble _tmp3_;
 	GdkPixbuf* _tmp4_;
 	cairo_pattern_t* _tmp5_ = NULL;
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (surface != NULL);
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (image != NULL);
+#line 134 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = surface;
+#line 134 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = cairo_create (_tmp0_);
+#line 134 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	context = _tmp1_;
+#line 135 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = dpi;
+#line 135 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3_ = dpi;
+#line 135 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	cairo_scale (context, 72.0 / _tmp2_, 72.0 / _tmp3_);
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp4_ = image;
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	gdk_cairo_set_source_pixbuf (context, _tmp4_, (gdouble) 0, (gdouble) 0);
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_ = cairo_get_source (context);
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	cairo_pattern_set_filter (_tmp5_, CAIRO_FILTER_BEST);
+#line 138 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	cairo_paint (context);
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_cairo_destroy0 (context);
+#line 1103 "book.c"
 }
 
 
 static gpointer _cairo_surface_reference0 (gpointer self) {
+#line 145 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return self ? cairo_surface_reference (self) : NULL;
+#line 1110 "book.c"
 }
 
 
@@ -758,28 +1121,49 @@ static void book_save_ps (Book* self, GFile* file, GError** error) {
 	cairo_surface_t* _tmp5_;
 	cairo_surface_t* surface;
 	GError * _inner_error_ = NULL;
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (file != NULL);
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = file;
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = g_file_replace (_tmp0_, NULL, FALSE, G_FILE_CREATE_NONE, NULL, &_inner_error_);
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	stream = _tmp1_;
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (_inner_error_ != NULL) {
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_propagate_error (error, _inner_error_);
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return;
+#line 1141 "book.c"
 	}
+#line 144 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = ps_writer_new (stream);
+#line 144 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	writer = _tmp2_;
+#line 145 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3_ = writer;
+#line 145 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp4_ = _tmp3_->surface;
+#line 145 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_ = _cairo_surface_reference0 (_tmp4_);
+#line 145 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	surface = _tmp5_;
+#line 1155 "book.c"
 	{
 		gint i;
+#line 147 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		i = 0;
+#line 1160 "book.c"
 		{
 			gboolean _tmp6_;
+#line 147 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			_tmp6_ = TRUE;
+#line 147 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			while (TRUE) {
+#line 1167 "book.c"
 				gboolean _tmp7_;
 				gint _tmp9_;
 				guint _tmp10_ = 0U;
@@ -808,55 +1192,103 @@ static void book_save_ps (Book* self, GFile* file, GError** error) {
 				gint _tmp29_ = 0;
 				cairo_surface_t* _tmp30_;
 				gint _tmp31_;
+#line 147 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp7_ = _tmp6_;
+#line 147 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (!_tmp7_) {
+#line 1200 "book.c"
 					gint _tmp8_;
+#line 147 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp8_ = i;
+#line 147 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					i = _tmp8_ + 1;
+#line 1206 "book.c"
 				}
+#line 147 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp6_ = FALSE;
+#line 147 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp9_ = i;
+#line 147 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp10_ = book_get_n_pages (self);
+#line 147 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (!(((guint) _tmp9_) < _tmp10_)) {
+#line 147 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					break;
+#line 1218 "book.c"
 				}
+#line 149 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp11_ = i;
+#line 149 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp12_ = book_get_page (self, _tmp11_);
+#line 149 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				page = _tmp12_;
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp13_ = page;
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp14_ = page_get_image (_tmp13_, TRUE);
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				image = _tmp14_;
+#line 151 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp15_ = image;
+#line 151 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp16_ = gdk_pixbuf_get_width (_tmp15_);
+#line 151 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp17_ = page;
+#line 151 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp18_ = page_get_dpi (_tmp17_);
+#line 151 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				width = (_tmp16_ * 72.0) / _tmp18_;
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp19_ = image;
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp20_ = gdk_pixbuf_get_height (_tmp19_);
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp21_ = page;
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp22_ = page_get_dpi (_tmp21_);
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				height = (_tmp20_ * 72.0) / _tmp22_;
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp23_ = surface;
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp24_ = width;
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp25_ = height;
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				cairo_ps_surface_set_size (_tmp23_, _tmp24_, _tmp25_);
+#line 154 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp26_ = surface;
+#line 154 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp27_ = image;
+#line 154 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp28_ = page;
+#line 154 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp29_ = page_get_dpi (_tmp28_);
+#line 154 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				book_save_ps_pdf_surface (self, _tmp26_, _tmp27_, (gdouble) _tmp29_);
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp30_ = surface;
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				cairo_surface_show_page (_tmp30_);
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp31_ = i;
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				g_signal_emit_by_name (self, "saving", _tmp31_);
+#line 147 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_g_object_unref0 (image);
+#line 147 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_page_unref0 (page);
+#line 1282 "book.c"
 			}
 		}
 	}
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_cairo_surface_destroy0 (surface);
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_ps_writer_unref0 (writer);
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_object_unref0 (stream);
+#line 1292 "book.c"
 }
 
 
@@ -884,266 +1316,360 @@ static guint8* book_compress_zlib (Book* self, guint8* data, int data_length1, i
 	gint _tmp14_ = 0;
 	guint8* _tmp15_;
 	gint _tmp15__length1;
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (self != NULL, NULL);
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	deflateInit (&stream, (gint) Z_BEST_COMPRESSION);
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = data;
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0__length1 = data_length1;
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = g_new0 (guint8, _tmp0__length1);
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	out_data = _tmp1_;
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	out_data_length1 = _tmp0__length1;
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_out_data_size_ = out_data_length1;
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = data;
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2__length1 = data_length1;
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	stream.next_in = _tmp2_;
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	stream.avail_in = _tmp2__length1;
+#line 166 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3_ = out_data;
+#line 166 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3__length1 = out_data_length1;
+#line 166 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	stream.next_out = _tmp3_;
+#line 166 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	stream.avail_out = _tmp3__length1;
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	while (TRUE) {
+#line 1354 "book.c"
 		z_stream _tmp4_;
 		guint _tmp5_;
 		gint _tmp6_ = 0;
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp4_ = stream;
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp5_ = _tmp4_.avail_in;
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (!(_tmp5_ > ((guint) 0))) {
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			break;
+#line 1366 "book.c"
 		}
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp6_ = deflate (&stream, (gint) Z_FINISH);
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (_tmp6_ == ((gint) Z_STREAM_ERROR)) {
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			break;
+#line 1374 "book.c"
 		}
 	}
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp7_ = stream;
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp8_ = _tmp7_.avail_in;
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (_tmp8_ > ((guint) 0)) {
+#line 1383 "book.c"
 		guint8* _tmp9_;
 		gint _tmp9__length1;
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp9_ = NULL;
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp9__length1 = 0;
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (result_length1) {
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			*result_length1 = _tmp9__length1;
+#line 1394 "book.c"
 		}
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		result = _tmp9_;
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		out_data = (g_free (out_data), NULL);
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		deflateEnd (&stream);
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return result;
+#line 1404 "book.c"
 	}
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp10_ = data;
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp10__length1 = data_length1;
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp11_ = stream;
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp12_ = _tmp11_.avail_out;
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	n_written = _tmp10__length1 - _tmp12_;
+#line 177 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp13_ = n_written;
+#line 177 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp14_ = (gint) _tmp13_;
+#line 177 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	out_data = g_renew (guint8, out_data, (gint) _tmp13_);
+#line 177 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	(_tmp14_ > out_data_length1) ? memset (out_data + out_data_length1, 0, sizeof (guint8) * (_tmp14_ - out_data_length1)) : NULL;
+#line 177 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	out_data_length1 = _tmp14_;
+#line 177 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_out_data_size_ = _tmp14_;
+#line 179 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp15_ = out_data;
+#line 179 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp15__length1 = out_data_length1;
+#line 179 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (result_length1) {
+#line 179 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*result_length1 = _tmp15__length1;
+#line 1436 "book.c"
 	}
+#line 179 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	result = _tmp15_;
+#line 179 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	deflateEnd (&stream);
+#line 179 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
+#line 1444 "book.c"
 }
 
 
-static void book_jpeg_init_cb (struct jpeg_compress_struct* info) {
-	g_return_if_fail (info != NULL);
-}
-
-
-static gboolean book_jpeg_empty_cb (struct jpeg_compress_struct* info) {
-	gboolean result = FALSE;
-	g_return_val_if_fail (info != NULL, FALSE);
-	result = TRUE;
-	return result;
-}
-
-
-static void book_jpeg_term_cb (struct jpeg_compress_struct* info) {
-	g_return_if_fail (info != NULL);
-}
-
-
-static void _book_jpeg_init_cb_jpeg_initdestinationfunc (struct jpeg_compress_struct* cinfo) {
-	book_jpeg_init_cb (cinfo);
-}
-
-
-static gboolean _book_jpeg_empty_cb_jpeg_emptyoutputbufferfunc (struct jpeg_compress_struct* cinfo) {
+static gboolean _book_write_pixbuf_data_gdk_pixbuf_save_func (guint8* buf, gsize buf_length1, GError** error, gpointer self) {
 	gboolean result;
-	result = book_jpeg_empty_cb (cinfo);
+	result = book_write_pixbuf_data (self, buf, buf_length1, error);
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
+#line 1453 "book.c"
 }
 
 
-static void _book_jpeg_term_cb_jpeg_termdestinationfunc (struct jpeg_compress_struct* cinfo) {
-	book_jpeg_term_cb (cinfo);
-}
-
-
-static guint8* book_compress_jpeg (Book* self, GdkPixbuf* image, gsize* n_written, int* result_length1) {
-	gsize _vala_n_written = 0UL;
+static guint8* book_compress_jpeg (Book* self, GdkPixbuf* image, gint quality, gint dpi, int* result_length1) {
 	guint8* result = NULL;
-	struct jpeg_compress_struct info = {0};
-	struct jpeg_error_mgr jerr = {0};
-	struct jpeg_destination_mgr dest_mgr = {0};
-	struct jpeg_error_mgr* _tmp0_ = NULL;
-	GdkPixbuf* _tmp1_;
-	gint _tmp2_ = 0;
-	GdkPixbuf* _tmp3_;
-	gint _tmp4_ = 0;
-	struct jpeg_compress_struct _tmp5_;
+	GByteArray* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar** _tmp5_ = NULL;
+	gchar** keys;
+	gint keys_length1;
+	gint _keys_size_;
 	gint _tmp6_;
-	struct jpeg_compress_struct _tmp7_;
-	gint _tmp8_;
-	struct jpeg_compress_struct _tmp9_;
-	gint _tmp10_;
-	gint max_length;
+	gchar* _tmp7_ = NULL;
+	gchar* _tmp8_;
+	gint _tmp9_;
+	gchar* _tmp10_ = NULL;
 	gint _tmp11_;
-	guint8* _tmp12_ = NULL;
+	gchar* _tmp12_ = NULL;
+	gchar** _tmp13_ = NULL;
+	gchar** values;
+	gint values_length1;
+	gint _values_size_;
+	GByteArray* _tmp15_;
+	guint8* _tmp16_;
+	gint _tmp16__length1;
 	guint8* data;
 	gint data_length1;
 	gint _data_size_;
-	guint8* _tmp13_;
-	gint _tmp13__length1;
-	gint _tmp14_;
-	GdkPixbuf* _tmp15_;
-	guint8* _tmp16_ = NULL;
-	guint8* pixels;
-	gint pixels_length1;
-	gint _pixels_size_;
-	gint _tmp28_;
-	struct jpeg_destination_mgr _tmp29_;
-	gint _tmp30_;
-	gint _tmp31_ = 0;
-	guint8* _tmp32_;
-	gint _tmp32__length1;
+	guint8* _tmp17_;
+	gint _tmp17__length1;
+	GError * _inner_error_ = NULL;
+#line 184 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (self != NULL, NULL);
+#line 184 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (image != NULL, NULL);
-	memset (&info, 0, sizeof (struct jpeg_compress_struct));
-	memset (&jerr, 0, sizeof (struct jpeg_error_mgr));
-	memset (&dest_mgr, 0, sizeof (struct jpeg_destination_mgr));
-	_tmp0_ = jpeg_std_error (&jerr);
-	info.err = _tmp0_;
-	jpeg_create_compress (&info);
-	_tmp1_ = image;
-	_tmp2_ = gdk_pixbuf_get_width (_tmp1_);
-	info.image_width = _tmp2_;
-	_tmp3_ = image;
-	_tmp4_ = gdk_pixbuf_get_height (_tmp3_);
-	info.image_height = _tmp4_;
-	info.input_components = 3;
-	info.in_color_space = JCS_RGB;
-	jpeg_set_defaults (&info);
-	_tmp5_ = info;
-	_tmp6_ = _tmp5_.image_width;
-	_tmp7_ = info;
-	_tmp8_ = _tmp7_.image_height;
-	_tmp9_ = info;
-	_tmp10_ = _tmp9_.input_components;
-	max_length = (_tmp6_ * _tmp8_) * _tmp10_;
-	_tmp11_ = max_length;
-	_tmp12_ = g_new0 (guint8, _tmp11_);
-	data = _tmp12_;
-	data_length1 = _tmp11_;
-	_data_size_ = data_length1;
-	_tmp13_ = data;
-	_tmp13__length1 = data_length1;
-	dest_mgr.next_output_byte = _tmp13_;
-	_tmp14_ = max_length;
-	dest_mgr.free_in_buffer = _tmp14_;
-	dest_mgr.init_destination = _book_jpeg_init_cb_jpeg_initdestinationfunc;
-	dest_mgr.empty_output_buffer = _book_jpeg_empty_cb_jpeg_emptyoutputbufferfunc;
-	dest_mgr.term_destination = _book_jpeg_term_cb_jpeg_termdestinationfunc;
-	info.dest = &dest_mgr;
-	jpeg_start_compress (&info, TRUE);
-	_tmp15_ = image;
-	_tmp16_ = gdk_pixbuf_get_pixels (_tmp15_);
-	pixels = _tmp16_;
-	pixels_length1 = -1;
-	_pixels_size_ = pixels_length1;
+#line 186 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp0_ = g_byte_array_new ();
+#line 186 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_byte_array_unref0 (self->priv->jpeg_data);
+#line 186 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	self->priv->jpeg_data = _tmp0_;
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp1_ = g_strdup ("quality");
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp2_ = g_strdup ("density-unit");
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp3_ = g_strdup ("x-density");
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp4_ = g_strdup ("y-density");
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp5_ = g_new0 (gchar*, 5 + 1);
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp5_[0] = _tmp1_;
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp5_[1] = _tmp2_;
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp5_[2] = _tmp3_;
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp5_[3] = _tmp4_;
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp5_[4] = NULL;
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	keys = _tmp5_;
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	keys_length1 = 5;
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_keys_size_ = keys_length1;
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp6_ = quality;
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp7_ = g_strdup_printf ("%d", _tmp6_);
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp8_ = g_strdup ("dots-per-inch");
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp9_ = dpi;
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp10_ = g_strdup_printf ("%d", _tmp9_);
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp11_ = dpi;
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp12_ = g_strdup_printf ("%d", _tmp11_);
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp13_ = g_new0 (gchar*, 5 + 1);
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp13_[0] = _tmp7_;
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp13_[1] = _tmp8_;
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp13_[2] = _tmp10_;
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp13_[3] = _tmp12_;
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp13_[4] = NULL;
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	values = _tmp13_;
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	values_length1 = 5;
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_values_size_ = values_length1;
+#line 1556 "book.c"
 	{
-		gint r;
-		r = 0;
-		{
-			gboolean _tmp17_;
-			_tmp17_ = TRUE;
-			while (TRUE) {
-				gboolean _tmp18_;
-				gint _tmp20_;
-				struct jpeg_compress_struct _tmp21_;
-				gint _tmp22_;
-				guint8* row[1] = {0};
-				guint8* _tmp23_;
-				gint _tmp23__length1;
-				gint _tmp24_;
-				GdkPixbuf* _tmp25_;
-				gint _tmp26_ = 0;
-				guint8* _tmp27_;
-				_tmp18_ = _tmp17_;
-				if (!_tmp18_) {
-					gint _tmp19_;
-					_tmp19_ = r;
-					r = _tmp19_ + 1;
-				}
-				_tmp17_ = FALSE;
-				_tmp20_ = r;
-				_tmp21_ = info;
-				_tmp22_ = _tmp21_.image_height;
-				if (!(_tmp20_ < _tmp22_)) {
-					break;
-				}
-				_tmp23_ = pixels;
-				_tmp23__length1 = pixels_length1;
-				_tmp24_ = r;
-				_tmp25_ = image;
-				_tmp26_ = gdk_pixbuf_get_rowstride (_tmp25_);
-				row[0] = ((guint8*) _tmp23_) + (_tmp24_ * _tmp26_);
-				_tmp27_ = row[0];
-				jpeg_write_scanlines (&info, row, 1);
-			}
+		GdkPixbuf* _tmp14_;
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+		_tmp14_ = image;
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+		gdk_pixbuf_save_to_callbackv (_tmp14_, _book_write_pixbuf_data_gdk_pixbuf_save_func, self, "jpeg", keys, values, &_inner_error_);
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+		if (_inner_error_ != NULL) {
+#line 1565 "book.c"
+			goto __catch0_g_error;
 		}
 	}
-	jpeg_finish_compress (&info);
-	_tmp28_ = max_length;
-	_tmp29_ = dest_mgr;
-	_tmp30_ = _tmp29_.free_in_buffer;
-	_vala_n_written = (gsize) (_tmp28_ - _tmp30_);
-	_tmp31_ = (gint) _vala_n_written;
-	data = g_renew (guint8, data, (gint) _vala_n_written);
-	(_tmp31_ > data_length1) ? memset (data + data_length1, 0, sizeof (guint8) * (_tmp31_ - data_length1)) : NULL;
-	data_length1 = _tmp31_;
-	_data_size_ = _tmp31_;
-	_tmp32_ = data;
-	_tmp32__length1 = data_length1;
-	if (result_length1) {
-		*result_length1 = _tmp32__length1;
+	goto __finally0;
+	__catch0_g_error:
+	{
+		GError* e = NULL;
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+		e = _inner_error_;
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+		_inner_error_ = NULL;
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+		_g_error_free0 (e);
+#line 1579 "book.c"
 	}
-	result = _tmp32_;
-	jpeg_destroy_compress (&info);
-	if (n_written) {
-		*n_written = _vala_n_written;
+	__finally0:
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	if (_inner_error_ != NULL) {
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+		values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+		keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+		g_clear_error (&_inner_error_);
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+		return NULL;
+#line 1594 "book.c"
 	}
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp15_ = self->priv->jpeg_data;
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp16_ = _tmp15_->data;
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp16__length1 = _tmp15_->len;
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp15_->data = NULL;
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	data = _tmp16_;
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	data_length1 = _tmp16__length1;
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_data_size_ = data_length1;
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_byte_array_unref0 (self->priv->jpeg_data);
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	self->priv->jpeg_data = NULL;
+#line 199 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp17_ = data;
+#line 199 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp17__length1 = data_length1;
+#line 199 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	if (result_length1) {
+#line 199 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+		*result_length1 = _tmp17__length1;
+#line 1622 "book.c"
+	}
+#line 199 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	result = _tmp17_;
+#line 199 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
+#line 199 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
+#line 199 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
+#line 1632 "book.c"
+}
+
+
+static gboolean book_write_pixbuf_data (Book* self, guint8* buf, int buf_length1, GError** error) {
+	gboolean result = FALSE;
+	GByteArray* _tmp0_;
+	guint8* _tmp1_;
+	gint _tmp1__length1;
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	g_return_val_if_fail (self != NULL, FALSE);
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp0_ = self->priv->jpeg_data;
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp1_ = buf;
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp1__length1 = buf_length1;
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	g_byte_array_append (_tmp0_, _tmp1_, _tmp1__length1);
+#line 205 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	result = TRUE;
+#line 205 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	return result;
+#line 1655 "book.c"
 }
 
 
 static guint8* _vala_array_dup1 (guint8* self, int length) {
+#line 404 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return g_memdup (self, length * sizeof (guint8));
+#line 1662 "book.c"
 }
 
 
 static guint8* _vala_array_dup2 (guint8* self, int length) {
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return g_memdup (self, length * sizeof (guint8));
+#line 1669 "book.c"
 }
 
 
-static void book_save_pdf (Book* self, GFile* file, GError** error) {
+static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error) {
 	GFile* _tmp0_;
 	GFileOutputStream* _tmp1_ = NULL;
 	GFileOutputStream* stream;
@@ -1184,118 +1710,179 @@ static void book_save_pdf (Book* self, GFile* file, GError** error) {
 	gchar* _tmp43_;
 	PDFWriter* _tmp44_;
 	PDFWriter* _tmp45_;
-	PDFWriter* _tmp350_;
-	PDFWriter* _tmp351_;
-	guint _tmp352_ = 0U;
-	guint info_number;
+	PDFWriter* _tmp352_;
 	PDFWriter* _tmp353_;
-	guint _tmp354_;
-	gchar* _tmp355_ = NULL;
-	gchar* _tmp356_;
-	PDFWriter* _tmp357_;
-	PDFWriter* _tmp358_;
-	gchar* _tmp359_ = NULL;
-	gchar* _tmp360_;
-	PDFWriter* _tmp361_;
-	PDFWriter* _tmp362_;
+	guint _tmp354_ = 0U;
+	guint info_number;
+	PDFWriter* _tmp355_;
+	guint _tmp356_;
+	gchar* _tmp357_ = NULL;
+	gchar* _tmp358_;
+	PDFWriter* _tmp359_;
+	PDFWriter* _tmp360_;
+	gchar* _tmp361_ = NULL;
+	gchar* _tmp362_;
 	PDFWriter* _tmp363_;
-	gsize _tmp364_;
-	gsize xref_offset;
+	PDFWriter* _tmp364_;
 	PDFWriter* _tmp365_;
-	PDFWriter* _tmp366_;
+	gsize _tmp366_;
+	gsize xref_offset;
 	PDFWriter* _tmp367_;
-	GList* _tmp368_;
-	guint _tmp369_ = 0U;
-	gchar* _tmp370_ = NULL;
-	gchar* _tmp371_;
-	PDFWriter* _tmp372_;
-	GList* _tmp373_;
-	PDFWriter* _tmp378_;
-	PDFWriter* _tmp379_;
+	PDFWriter* _tmp368_;
+	PDFWriter* _tmp369_;
+	GList* _tmp370_;
+	guint _tmp371_ = 0U;
+	gchar* _tmp372_ = NULL;
+	gchar* _tmp373_;
+	PDFWriter* _tmp374_;
+	GList* _tmp375_;
 	PDFWriter* _tmp380_;
 	PDFWriter* _tmp381_;
-	GList* _tmp382_;
-	guint _tmp383_ = 0U;
-	gchar* _tmp384_ = NULL;
-	gchar* _tmp385_;
-	PDFWriter* _tmp386_;
-	guint _tmp387_;
-	gchar* _tmp388_ = NULL;
-	gchar* _tmp389_;
-	PDFWriter* _tmp390_;
-	guint _tmp391_;
-	gchar* _tmp392_ = NULL;
-	gchar* _tmp393_;
-	PDFWriter* _tmp394_;
-	PDFWriter* _tmp395_;
+	PDFWriter* _tmp382_;
+	PDFWriter* _tmp383_;
+	GList* _tmp384_;
+	guint _tmp385_ = 0U;
+	gchar* _tmp386_ = NULL;
+	gchar* _tmp387_;
+	PDFWriter* _tmp388_;
+	guint _tmp389_;
+	gchar* _tmp390_ = NULL;
+	gchar* _tmp391_;
+	PDFWriter* _tmp392_;
+	guint _tmp393_;
+	gchar* _tmp394_ = NULL;
+	gchar* _tmp395_;
 	PDFWriter* _tmp396_;
-	gsize _tmp397_;
-	gchar* _tmp398_ = NULL;
-	gchar* _tmp399_;
-	PDFWriter* _tmp400_;
+	PDFWriter* _tmp397_;
+	PDFWriter* _tmp398_;
+	gsize _tmp399_;
+	gchar* _tmp400_ = NULL;
+	gchar* _tmp401_;
+	PDFWriter* _tmp402_;
 	GError * _inner_error_ = NULL;
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (file != NULL);
+#line 210 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = file;
+#line 210 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = g_file_replace (_tmp0_, NULL, FALSE, G_FILE_CREATE_NONE, NULL, &_inner_error_);
+#line 210 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	stream = _tmp1_;
+#line 210 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (_inner_error_ != NULL) {
+#line 210 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_propagate_error (error, _inner_error_);
+#line 210 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return;
+#line 1780 "book.c"
 	}
+#line 211 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = pdf_writer_new (stream);
+#line 211 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	writer = _tmp2_;
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3_ = writer;
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp3_, "%PDF-1.3\n");
+#line 217 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp4_ = writer;
+#line 217 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp4_, "%\xe2\xe3\xcf\xd3\n");
+#line 220 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_ = writer;
+#line 220 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp6_ = pdf_writer_start_object (_tmp5_);
+#line 220 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	catalog_number = _tmp6_;
+#line 221 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp7_ = writer;
+#line 221 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp8_ = catalog_number;
+#line 221 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp9_ = g_strdup_printf ("%u 0 obj\n", _tmp8_);
+#line 221 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp10_ = _tmp9_;
+#line 221 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp7_, _tmp10_);
+#line 221 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_free0 (_tmp10_);
+#line 222 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp11_ = writer;
+#line 222 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp11_, "<<\n");
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp12_ = writer;
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp12_, "/Type /Catalog\n");
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp13_ = writer;
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp14_ = catalog_number;
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp15_ = g_strdup_printf ("/Pages %u 0 R\n", _tmp14_ + 1);
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp16_ = _tmp15_;
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp13_, _tmp16_);
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_free0 (_tmp16_);
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp17_ = writer;
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp17_, ">>\n");
+#line 227 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp18_ = writer;
+#line 227 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp18_, "endobj\n");
+#line 245 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp19_ = writer;
+#line 245 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp19_, "\n");
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp20_ = writer;
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp21_ = pdf_writer_start_object (_tmp20_);
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pages_number = _tmp21_;
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp22_ = writer;
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp23_ = pages_number;
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp24_ = g_strdup_printf ("%u 0 obj\n", _tmp23_);
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp25_ = _tmp24_;
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp22_, _tmp25_);
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_free0 (_tmp25_);
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp26_ = writer;
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp26_, "<<\n");
+#line 249 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp27_ = writer;
+#line 249 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp27_, "/Type /Pages\n");
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp28_ = writer;
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp28_, "/Kids [");
+#line 1874 "book.c"
 	{
 		gint i;
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		i = 0;
+#line 1879 "book.c"
 		{
 			gboolean _tmp29_;
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			_tmp29_ = TRUE;
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			while (TRUE) {
+#line 1886 "book.c"
 				gboolean _tmp30_;
 				gint _tmp32_;
 				guint _tmp33_ = 0U;
@@ -1304,47 +1891,85 @@ static void book_save_pdf (Book* self, GFile* file, GError** error) {
 				gint _tmp36_;
 				gchar* _tmp37_ = NULL;
 				gchar* _tmp38_;
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp30_ = _tmp29_;
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (!_tmp30_) {
+#line 1899 "book.c"
 					gint _tmp31_;
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp31_ = i;
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					i = _tmp31_ + 1;
+#line 1905 "book.c"
 				}
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp29_ = FALSE;
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp32_ = i;
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp33_ = book_get_n_pages (self);
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (!(((guint) _tmp32_) < _tmp33_)) {
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					break;
+#line 1917 "book.c"
 				}
+#line 252 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp34_ = writer;
+#line 252 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp35_ = pages_number;
+#line 252 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp36_ = i;
+#line 252 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp37_ = g_strdup_printf (" %u 0 R", (_tmp35_ + 1) + (_tmp36_ * 3));
+#line 252 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp38_ = _tmp37_;
+#line 252 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pdf_writer_write_string (_tmp34_, _tmp38_);
+#line 252 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_g_free0 (_tmp38_);
+#line 1933 "book.c"
 			}
 		}
 	}
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp39_ = writer;
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp39_, " ]\n");
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp40_ = writer;
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp41_ = book_get_n_pages (self);
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp42_ = g_strdup_printf ("/Count %u\n", _tmp41_);
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp43_ = _tmp42_;
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp40_, _tmp43_);
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_free0 (_tmp43_);
+#line 255 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp44_ = writer;
+#line 255 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp44_, ">>\n");
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp45_ = writer;
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp45_, "endobj\n");
+#line 1961 "book.c"
 	{
 		gint i;
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		i = 0;
+#line 1966 "book.c"
 		{
 			gboolean _tmp46_;
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			_tmp46_ = TRUE;
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			while (TRUE) {
+#line 1973 "book.c"
 				gboolean _tmp47_;
 				gint _tmp49_;
 				guint _tmp50_ = 0U;
@@ -1399,193 +2024,265 @@ static void book_save_pdf (Book* self, GFile* file, GError** error) {
 				gint _compressed_data_size_;
 				guint8* _tmp230_;
 				gint _tmp230__length1;
-				PDFWriter* _tmp245_;
-				PDFWriter* _tmp246_;
-				guint _tmp247_ = 0U;
-				guint number;
+				PDFWriter* _tmp247_;
 				PDFWriter* _tmp248_;
-				guint _tmp249_;
-				gchar* _tmp250_ = NULL;
-				gchar* _tmp251_;
-				PDFWriter* _tmp252_;
-				PDFWriter* _tmp253_;
+				guint _tmp249_ = 0U;
+				guint number;
+				PDFWriter* _tmp250_;
+				guint _tmp251_;
+				gchar* _tmp252_ = NULL;
+				gchar* _tmp253_;
 				PDFWriter* _tmp254_;
-				guint _tmp255_;
-				gchar* _tmp256_ = NULL;
-				gchar* _tmp257_;
-				PDFWriter* _tmp258_;
-				gint _tmp259_;
-				guint _tmp260_;
-				gchar* _tmp261_ = NULL;
-				gchar* _tmp262_;
-				PDFWriter* _tmp263_;
-				gdouble _tmp264_;
-				gchar* _tmp265_;
-				gint _tmp265__length1;
-				const gchar* _tmp266_ = NULL;
-				gdouble _tmp267_;
-				gchar* _tmp268_;
-				gint _tmp268__length1;
-				const gchar* _tmp269_ = NULL;
-				gchar* _tmp270_ = NULL;
-				gchar* _tmp271_;
-				PDFWriter* _tmp272_;
-				guint _tmp273_;
-				gchar* _tmp274_ = NULL;
-				gchar* _tmp275_;
-				PDFWriter* _tmp276_;
-				PDFWriter* _tmp277_;
+				PDFWriter* _tmp255_;
+				PDFWriter* _tmp256_;
+				guint _tmp257_;
+				gchar* _tmp258_ = NULL;
+				gchar* _tmp259_;
+				PDFWriter* _tmp260_;
+				gint _tmp261_;
+				guint _tmp262_;
+				gchar* _tmp263_ = NULL;
+				gchar* _tmp264_;
+				PDFWriter* _tmp265_;
+				gdouble _tmp266_;
+				gchar* _tmp267_;
+				gint _tmp267__length1;
+				const gchar* _tmp268_ = NULL;
+				gdouble _tmp269_;
+				gchar* _tmp270_;
+				gint _tmp270__length1;
+				const gchar* _tmp271_ = NULL;
+				gchar* _tmp272_ = NULL;
+				gchar* _tmp273_;
+				PDFWriter* _tmp274_;
+				guint _tmp275_;
+				gchar* _tmp276_ = NULL;
+				gchar* _tmp277_;
 				PDFWriter* _tmp278_;
 				PDFWriter* _tmp279_;
-				guint _tmp280_ = 0U;
+				PDFWriter* _tmp280_;
 				PDFWriter* _tmp281_;
-				guint _tmp282_;
-				gchar* _tmp283_ = NULL;
-				gchar* _tmp284_;
-				PDFWriter* _tmp285_;
-				PDFWriter* _tmp286_;
+				guint _tmp282_ = 0U;
+				PDFWriter* _tmp283_;
+				guint _tmp284_;
+				gchar* _tmp285_ = NULL;
+				gchar* _tmp286_;
 				PDFWriter* _tmp287_;
 				PDFWriter* _tmp288_;
-				gint _tmp289_;
-				gchar* _tmp290_ = NULL;
-				gchar* _tmp291_;
-				PDFWriter* _tmp292_;
-				gint _tmp293_;
-				gchar* _tmp294_ = NULL;
-				gchar* _tmp295_;
-				PDFWriter* _tmp296_;
-				const gchar* _tmp297_;
-				gchar* _tmp298_ = NULL;
-				gchar* _tmp299_;
-				PDFWriter* _tmp300_;
-				gint _tmp301_;
-				gchar* _tmp302_ = NULL;
-				gchar* _tmp303_;
-				PDFWriter* _tmp304_;
-				guint8* _tmp305_;
-				gint _tmp305__length1;
-				gchar* _tmp306_ = NULL;
-				gchar* _tmp307_;
-				const gchar* _tmp308_;
-				PDFWriter* _tmp313_;
-				PDFWriter* _tmp314_;
+				PDFWriter* _tmp289_;
+				PDFWriter* _tmp290_;
+				gint _tmp291_;
+				gchar* _tmp292_ = NULL;
+				gchar* _tmp293_;
+				PDFWriter* _tmp294_;
+				gint _tmp295_;
+				gchar* _tmp296_ = NULL;
+				gchar* _tmp297_;
+				PDFWriter* _tmp298_;
+				const gchar* _tmp299_;
+				gchar* _tmp300_ = NULL;
+				gchar* _tmp301_;
+				PDFWriter* _tmp302_;
+				gint _tmp303_;
+				gchar* _tmp304_ = NULL;
+				gchar* _tmp305_;
+				PDFWriter* _tmp306_;
+				guint8* _tmp307_;
+				gint _tmp307__length1;
+				gchar* _tmp308_ = NULL;
+				gchar* _tmp309_;
+				const gchar* _tmp310_;
 				PDFWriter* _tmp315_;
-				guint8* _tmp316_;
-				gint _tmp316__length1;
+				PDFWriter* _tmp316_;
 				PDFWriter* _tmp317_;
-				PDFWriter* _tmp318_;
+				guint8* _tmp318_;
+				gint _tmp318__length1;
 				PDFWriter* _tmp319_;
-				gdouble _tmp320_;
-				gchar* _tmp321_;
-				gint _tmp321__length1;
-				const gchar* _tmp322_ = NULL;
-				gdouble _tmp323_;
-				gchar* _tmp324_;
-				gint _tmp324__length1;
-				const gchar* _tmp325_ = NULL;
-				gint _tmp326_;
-				gchar* _tmp327_ = NULL;
+				PDFWriter* _tmp320_;
+				PDFWriter* _tmp321_;
+				gdouble _tmp322_;
+				gchar* _tmp323_;
+				gint _tmp323__length1;
+				const gchar* _tmp324_ = NULL;
+				gdouble _tmp325_;
+				gchar* _tmp326_;
+				gint _tmp326__length1;
+				const gchar* _tmp327_ = NULL;
+				gint _tmp328_;
+				gchar* _tmp329_ = NULL;
 				gchar* command;
-				PDFWriter* _tmp328_;
-				PDFWriter* _tmp329_;
-				guint _tmp330_ = 0U;
+				PDFWriter* _tmp330_;
 				PDFWriter* _tmp331_;
-				guint _tmp332_;
-				gchar* _tmp333_ = NULL;
-				gchar* _tmp334_;
-				PDFWriter* _tmp335_;
-				PDFWriter* _tmp336_;
-				const gchar* _tmp337_;
-				gint _tmp338_;
-				gint _tmp339_;
-				gchar* _tmp340_ = NULL;
-				gchar* _tmp341_;
-				PDFWriter* _tmp342_;
-				PDFWriter* _tmp343_;
+				guint _tmp332_ = 0U;
+				PDFWriter* _tmp333_;
+				guint _tmp334_;
+				gchar* _tmp335_ = NULL;
+				gchar* _tmp336_;
+				PDFWriter* _tmp337_;
+				PDFWriter* _tmp338_;
+				const gchar* _tmp339_;
+				gint _tmp340_;
+				gint _tmp341_;
+				gchar* _tmp342_ = NULL;
+				gchar* _tmp343_;
 				PDFWriter* _tmp344_;
-				const gchar* _tmp345_;
+				PDFWriter* _tmp345_;
 				PDFWriter* _tmp346_;
-				PDFWriter* _tmp347_;
+				const gchar* _tmp347_;
 				PDFWriter* _tmp348_;
-				gint _tmp349_;
+				PDFWriter* _tmp349_;
+				PDFWriter* _tmp350_;
+				gint _tmp351_;
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp47_ = _tmp46_;
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (!_tmp47_) {
+#line 2141 "book.c"
 					gint _tmp48_;
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp48_ = i;
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					i = _tmp48_ + 1;
+#line 2147 "book.c"
 				}
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp46_ = FALSE;
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp49_ = i;
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp50_ = book_get_n_pages (self);
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (!(((guint) _tmp49_) < _tmp50_)) {
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					break;
+#line 2159 "book.c"
 				}
+#line 260 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp51_ = i;
+#line 260 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp52_ = book_get_page (self, _tmp51_);
+#line 260 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				page = _tmp52_;
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp53_ = page;
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp54_ = page_get_image (_tmp53_, TRUE);
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				image = _tmp54_;
+#line 262 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp55_ = image;
+#line 262 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp56_ = gdk_pixbuf_get_width (_tmp55_);
+#line 262 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				width = _tmp56_;
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp57_ = image;
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp58_ = gdk_pixbuf_get_height (_tmp57_);
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				height = _tmp58_;
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp59_ = image;
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp60_ = gdk_pixbuf_get_pixels (_tmp59_);
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pixels = _tmp60_;
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pixels_length1 = -1;
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_pixels_size_ = pixels_length1;
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp61_ = width;
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp62_ = page;
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp63_ = page_get_dpi (_tmp62_);
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				page_width = (_tmp61_ * 72.0) / _tmp63_;
+#line 266 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp64_ = height;
+#line 266 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp65_ = page;
+#line 266 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp66_ = page_get_dpi (_tmp65_);
+#line 266 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				page_height = (_tmp64_ * 72.0) / _tmp66_;
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				depth = 8;
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp67_ = g_strdup ("DeviceRGB");
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				color_space = _tmp67_;
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				filter = NULL;
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp68_ = g_new0 (gchar, G_ASCII_DTOSTR_BUF_SIZE);
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				width_buffer = _tmp68_;
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				width_buffer_length1 = G_ASCII_DTOSTR_BUF_SIZE;
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_width_buffer_size_ = width_buffer_length1;
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp69_ = g_new0 (gchar, G_ASCII_DTOSTR_BUF_SIZE);
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				height_buffer = _tmp69_;
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				height_buffer_length1 = G_ASCII_DTOSTR_BUF_SIZE;
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_height_buffer_size_ = height_buffer_length1;
+#line 274 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp70_ = page;
+#line 274 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp71_ = page_is_color (_tmp70_);
+#line 274 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (_tmp71_) {
+#line 2241 "book.c"
 					gchar* _tmp72_;
 					gint _tmp73_;
 					gint _tmp74_;
 					gint data_length;
 					gint _tmp75_;
 					guint8* _tmp76_ = NULL;
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					depth = 8;
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp72_ = g_strdup ("DeviceRGB");
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_g_free0 (color_space);
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					color_space = _tmp72_;
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp73_ = height;
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp74_ = width;
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					data_length = (_tmp73_ * _tmp74_) * 3;
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp75_ = data_length;
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp76_ = g_new0 (guint8, _tmp75_);
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					data = (g_free (data), NULL);
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					data = _tmp76_;
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					data_length1 = _tmp75_;
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_data_size_ = data_length1;
+#line 2274 "book.c"
 					{
 						gint row;
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						row = 0;
+#line 2279 "book.c"
 						{
 							gboolean _tmp77_;
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_tmp77_ = TRUE;
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							while (TRUE) {
+#line 2286 "book.c"
 								gboolean _tmp78_;
 								gint _tmp80_;
 								gint _tmp81_;
@@ -1596,32 +2293,57 @@ static void book_save_pdf (Book* self, GFile* file, GError** error) {
 								gint _tmp85_;
 								gint _tmp86_;
 								gint out_offset;
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 								_tmp78_ = _tmp77_;
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 								if (!_tmp78_) {
+#line 2301 "book.c"
 									gint _tmp79_;
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									_tmp79_ = row;
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									row = _tmp79_ + 1;
+#line 2307 "book.c"
 								}
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 								_tmp77_ = FALSE;
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 								_tmp80_ = row;
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 								_tmp81_ = height;
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 								if (!(_tmp80_ < _tmp81_)) {
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									break;
+#line 2319 "book.c"
 								}
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 								_tmp82_ = row;
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 								_tmp83_ = image;
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 								_tmp84_ = gdk_pixbuf_get_rowstride (_tmp83_);
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 								in_offset = _tmp82_ * _tmp84_;
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 								_tmp85_ = row;
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 								_tmp86_ = width;
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 								out_offset = (_tmp85_ * _tmp86_) * 3;
+#line 2335 "book.c"
 								{
 									gint x;
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									x = 0;
+#line 2340 "book.c"
 									{
 										gboolean _tmp87_;
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										_tmp87_ = TRUE;
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										while (TRUE) {
+#line 2347 "book.c"
 											gboolean _tmp88_;
 											gint _tmp90_;
 											gint _tmp91_;
@@ -1655,51 +2377,97 @@ static void book_save_pdf (Book* self, GFile* file, GError** error) {
 											gint _tmp111_;
 											guint8 _tmp112_;
 											guint8 _tmp113_;
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp88_ = _tmp87_;
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											if (!_tmp88_) {
+#line 2385 "book.c"
 												gint _tmp89_;
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												_tmp89_ = x;
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												x = _tmp89_ + 1;
+#line 2391 "book.c"
 											}
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp87_ = FALSE;
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp90_ = x;
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp91_ = width;
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											if (!(_tmp90_ < _tmp91_)) {
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												break;
+#line 2403 "book.c"
 											}
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp92_ = in_offset;
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp93_ = x;
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											in_o = _tmp92_ + (_tmp93_ * 3);
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp94_ = out_offset;
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp95_ = x;
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											out_o = _tmp94_ + (_tmp95_ * 3);
+#line 289 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp96_ = data;
+#line 289 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp96__length1 = data_length1;
+#line 289 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp97_ = out_o;
+#line 289 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp98_ = pixels;
+#line 289 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp98__length1 = pixels_length1;
+#line 289 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp99_ = in_o;
+#line 289 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp100_ = _tmp98_[_tmp99_];
+#line 289 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp96_[_tmp97_] = _tmp100_;
+#line 289 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp101_ = _tmp96_[_tmp97_];
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp102_ = data;
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp102__length1 = data_length1;
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp103_ = out_o;
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp104_ = pixels;
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp104__length1 = pixels_length1;
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp105_ = in_o;
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp106_ = _tmp104_[_tmp105_ + 1];
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp102_[_tmp103_ + 1] = _tmp106_;
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp107_ = _tmp102_[_tmp103_ + 1];
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp108_ = data;
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp108__length1 = data_length1;
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp109_ = out_o;
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp110_ = pixels;
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp110__length1 = pixels_length1;
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp111_ = in_o;
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp112_ = _tmp110_[_tmp111_ + 2];
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp108_[_tmp109_ + 2] = _tmp112_;
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp113_ = _tmp108_[_tmp109_ + 2];
+#line 2471 "book.c"
 										}
 									}
 								}
@@ -1709,9 +2477,13 @@ static void book_save_pdf (Book* self, GFile* file, GError** error) {
 				} else {
 					Page* _tmp114_;
 					gint _tmp115_ = 0;
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp114_ = page;
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp115_ = page_get_depth (_tmp114_);
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					if (_tmp115_ == 2) {
+#line 2487 "book.c"
 						gint shift_count;
 						gchar* _tmp116_;
 						gint _tmp117_;
@@ -1720,28 +2492,49 @@ static void book_save_pdf (Book* self, GFile* file, GError** error) {
 						gint _tmp119_;
 						guint8* _tmp120_ = NULL;
 						gint offset;
+#line 297 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						shift_count = 6;
+#line 298 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						depth = 2;
+#line 299 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_tmp116_ = g_strdup ("DeviceGray");
+#line 299 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_g_free0 (color_space);
+#line 299 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						color_space = _tmp116_;
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_tmp117_ = height;
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_tmp118_ = width;
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						data_length = _tmp117_ * (((_tmp118_ * 2) + 7) / 8);
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_tmp119_ = data_length;
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_tmp120_ = g_new0 (guint8, _tmp119_);
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						data = (g_free (data), NULL);
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						data = _tmp120_;
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						data_length1 = _tmp119_;
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_data_size_ = data_length1;
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						offset = 0;
+#line 2526 "book.c"
 						{
 							gint row;
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							row = 0;
+#line 2531 "book.c"
 							{
 								gboolean _tmp121_;
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 								_tmp121_ = TRUE;
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 								while (TRUE) {
+#line 2538 "book.c"
 									gboolean _tmp122_;
 									gint _tmp124_;
 									gint _tmp125_;
@@ -1750,36 +2543,65 @@ static void book_save_pdf (Book* self, GFile* file, GError** error) {
 									GdkPixbuf* _tmp129_;
 									gint _tmp130_ = 0;
 									gint in_offset;
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									_tmp122_ = _tmp121_;
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									if (!_tmp122_) {
+#line 2551 "book.c"
 										gint _tmp123_;
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										_tmp123_ = row;
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										row = _tmp123_ + 1;
+#line 2557 "book.c"
 									}
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									_tmp121_ = FALSE;
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									_tmp124_ = row;
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									_tmp125_ = height;
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									if (!(_tmp124_ < _tmp125_)) {
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										break;
+#line 2569 "book.c"
 									}
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									_tmp126_ = shift_count;
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									if (_tmp126_ != 6) {
+#line 2575 "book.c"
 										gint _tmp127_;
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										_tmp127_ = offset;
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										offset = _tmp127_ + 1;
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										shift_count = 6;
+#line 2583 "book.c"
 									}
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									_tmp128_ = row;
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									_tmp129_ = image;
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									_tmp130_ = gdk_pixbuf_get_rowstride (_tmp129_);
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									in_offset = _tmp128_ * _tmp130_;
+#line 2593 "book.c"
 									{
 										gint x;
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										x = 0;
+#line 2598 "book.c"
 										{
 											gboolean _tmp131_;
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp131_ = TRUE;
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											while (TRUE) {
+#line 2605 "book.c"
 												gboolean _tmp132_;
 												gint _tmp134_;
 												gint _tmp135_;
@@ -1792,92 +2614,159 @@ static void book_save_pdf (Book* self, GFile* file, GError** error) {
 												guint8 p;
 												guint8 _tmp144_;
 												gint _tmp159_;
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												_tmp132_ = _tmp131_;
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												if (!_tmp132_) {
+#line 2622 "book.c"
 													gint _tmp133_;
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp133_ = x;
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													x = _tmp133_ + 1;
+#line 2628 "book.c"
 												}
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												_tmp131_ = FALSE;
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												_tmp134_ = x;
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												_tmp135_ = width;
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												if (!(_tmp134_ < _tmp135_)) {
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													break;
+#line 2640 "book.c"
 												}
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												_tmp136_ = shift_count;
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												if (_tmp136_ == 6) {
+#line 2646 "book.c"
 													guint8* _tmp137_;
 													gint _tmp137__length1;
 													gint _tmp138_;
 													guint8 _tmp139_;
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp137_ = data;
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp137__length1 = data_length1;
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp138_ = offset;
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp137_[_tmp138_] = (guint8) 0;
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp139_ = _tmp137_[_tmp138_];
+#line 2661 "book.c"
 												}
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												_tmp140_ = pixels;
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												_tmp140__length1 = pixels_length1;
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												_tmp141_ = in_offset;
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												_tmp142_ = x;
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												_tmp143_ = _tmp140_[_tmp141_ + (_tmp142_ * 3)];
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												p = _tmp143_;
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												_tmp144_ = p;
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												if (((gint) _tmp144_) >= 192) {
+#line 2679 "book.c"
 													guint8* _tmp145_;
 													gint _tmp145__length1;
 													gint _tmp146_;
 													gint _tmp147_;
 													guint8 _tmp148_;
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp145_ = data;
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp145__length1 = data_length1;
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp146_ = offset;
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp147_ = shift_count;
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp145_[_tmp146_] |= (guint8) (3 << _tmp147_);
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp148_ = _tmp145_[_tmp146_];
+#line 2697 "book.c"
 												} else {
 													guint8 _tmp149_;
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp149_ = p;
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													if (((gint) _tmp149_) >= 128) {
+#line 2704 "book.c"
 														guint8* _tmp150_;
 														gint _tmp150__length1;
 														gint _tmp151_;
 														gint _tmp152_;
 														guint8 _tmp153_;
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														_tmp150_ = data;
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														_tmp150__length1 = data_length1;
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														_tmp151_ = offset;
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														_tmp152_ = shift_count;
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														_tmp150_[_tmp151_] |= (guint8) (2 << _tmp152_);
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														_tmp153_ = _tmp150_[_tmp151_];
+#line 2722 "book.c"
 													} else {
 														guint8 _tmp154_;
+#line 325 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														_tmp154_ = p;
+#line 325 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														if (((gint) _tmp154_) >= 64) {
+#line 2729 "book.c"
 															guint8* _tmp155_;
 															gint _tmp155__length1;
 															gint _tmp156_;
 															gint _tmp157_;
 															guint8 _tmp158_;
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 															_tmp155_ = data;
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 															_tmp155__length1 = data_length1;
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 															_tmp156_ = offset;
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 															_tmp157_ = shift_count;
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 															_tmp155_[_tmp156_] |= (guint8) (1 << _tmp157_);
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 															_tmp158_ = _tmp155_[_tmp156_];
+#line 2747 "book.c"
 														}
 													}
 												}
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												_tmp159_ = shift_count;
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												if (_tmp159_ == 0) {
+#line 2755 "book.c"
 													gint _tmp160_;
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp160_ = offset;
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													offset = _tmp160_ + 1;
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													shift_count = 6;
+#line 2763 "book.c"
 												} else {
 													gint _tmp161_;
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp161_ = shift_count;
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													shift_count = _tmp161_ - 2;
+#line 2770 "book.c"
 												}
 											}
 										}
@@ -1888,9 +2777,13 @@ static void book_save_pdf (Book* self, GFile* file, GError** error) {
 					} else {
 						Page* _tmp162_;
 						gint _tmp163_ = 0;
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_tmp162_ = page;
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_tmp163_ = page_get_depth (_tmp162_);
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						if (_tmp163_ == 1) {
+#line 2787 "book.c"
 							gint mask;
 							gchar* _tmp164_;
 							gint _tmp165_;
@@ -1899,28 +2792,49 @@ static void book_save_pdf (Book* self, GFile* file, GError** error) {
 							gint _tmp167_;
 							guint8* _tmp168_ = NULL;
 							gint offset;
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							mask = 0x80;
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							depth = 1;
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_tmp164_ = g_strdup ("DeviceGray");
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_g_free0 (color_space);
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							color_space = _tmp164_;
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_tmp165_ = height;
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_tmp166_ = width;
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							data_length = _tmp165_ * ((_tmp166_ + 7) / 8);
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_tmp167_ = data_length;
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_tmp168_ = g_new0 (guint8, _tmp167_);
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							data = (g_free (data), NULL);
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							data = _tmp168_;
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							data_length1 = _tmp167_;
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_data_size_ = data_length1;
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							offset = 0;
+#line 2826 "book.c"
 							{
 								gint row;
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 								row = 0;
+#line 2831 "book.c"
 								{
 									gboolean _tmp169_;
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									_tmp169_ = TRUE;
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									while (TRUE) {
+#line 2838 "book.c"
 										gboolean _tmp170_;
 										gint _tmp172_;
 										gint _tmp173_;
@@ -1929,36 +2843,65 @@ static void book_save_pdf (Book* self, GFile* file, GError** error) {
 										GdkPixbuf* _tmp177_;
 										gint _tmp178_ = 0;
 										gint in_offset;
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										_tmp170_ = _tmp169_;
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										if (!_tmp170_) {
+#line 2851 "book.c"
 											gint _tmp171_;
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp171_ = row;
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											row = _tmp171_ + 1;
+#line 2857 "book.c"
 										}
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										_tmp169_ = FALSE;
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										_tmp172_ = row;
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										_tmp173_ = height;
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										if (!(_tmp172_ < _tmp173_)) {
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											break;
+#line 2869 "book.c"
 										}
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										_tmp174_ = mask;
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										if (_tmp174_ != 0x80) {
+#line 2875 "book.c"
 											gint _tmp175_;
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp175_ = offset;
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											offset = _tmp175_ + 1;
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											mask = 0x80;
+#line 2883 "book.c"
 										}
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										_tmp176_ = row;
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										_tmp177_ = image;
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										_tmp178_ = gdk_pixbuf_get_rowstride (_tmp177_);
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										in_offset = _tmp176_ * _tmp178_;
+#line 2893 "book.c"
 										{
 											gint x;
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											x = 0;
+#line 2898 "book.c"
 											{
 												gboolean _tmp179_;
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												_tmp179_ = TRUE;
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												while (TRUE) {
+#line 2905 "book.c"
 													gboolean _tmp180_;
 													gint _tmp182_;
 													gint _tmp183_;
@@ -1970,56 +2913,100 @@ static void book_save_pdf (Book* self, GFile* file, GError** error) {
 													guint8 _tmp191_;
 													gint _tmp196_;
 													gint _tmp197_;
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp180_ = _tmp179_;
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													if (!_tmp180_) {
+#line 2921 "book.c"
 														gint _tmp181_;
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														_tmp181_ = x;
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														x = _tmp181_ + 1;
+#line 2927 "book.c"
 													}
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp179_ = FALSE;
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp182_ = x;
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp183_ = width;
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													if (!(_tmp182_ < _tmp183_)) {
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														break;
+#line 2939 "book.c"
 													}
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp184_ = mask;
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													if (_tmp184_ == 0x80) {
+#line 2945 "book.c"
 														guint8* _tmp185_;
 														gint _tmp185__length1;
 														gint _tmp186_;
 														guint8 _tmp187_;
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														_tmp185_ = data;
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														_tmp185__length1 = data_length1;
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														_tmp186_ = offset;
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														_tmp185_[_tmp186_] = (guint8) 0;
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														_tmp187_ = _tmp185_[_tmp186_];
+#line 2960 "book.c"
 													}
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp188_ = pixels;
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp188__length1 = pixels_length1;
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp189_ = in_offset;
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp190_ = x;
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp191_ = _tmp188_[_tmp189_ + (_tmp190_ * 3)];
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													if (((gint) _tmp191_) != 0) {
+#line 2974 "book.c"
 														guint8* _tmp192_;
 														gint _tmp192__length1;
 														gint _tmp193_;
 														gint _tmp194_;
 														guint8 _tmp195_;
+#line 366 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														_tmp192_ = data;
+#line 366 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														_tmp192__length1 = data_length1;
+#line 366 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														_tmp193_ = offset;
+#line 366 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														_tmp194_ = mask;
+#line 366 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														_tmp192_[_tmp193_] |= (guint8) _tmp194_;
+#line 366 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														_tmp195_ = _tmp192_[_tmp193_];
+#line 2992 "book.c"
 													}
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp196_ = mask;
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													mask = _tmp196_ >> 1;
+#line 370 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp197_ = mask;
+#line 370 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													if (_tmp197_ == 0) {
+#line 3002 "book.c"
 														gint _tmp198_;
+#line 372 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														_tmp198_ = offset;
+#line 372 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														offset = _tmp198_ + 1;
+#line 373 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														mask = 0x80;
+#line 3010 "book.c"
 													}
 												}
 											}
@@ -2034,26 +3021,45 @@ static void book_save_pdf (Book* self, GFile* file, GError** error) {
 							gint data_length;
 							gint _tmp202_;
 							guint8* _tmp203_ = NULL;
+#line 380 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							depth = 8;
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_tmp199_ = g_strdup ("DeviceGray");
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_g_free0 (color_space);
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							color_space = _tmp199_;
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_tmp200_ = height;
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_tmp201_ = width;
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							data_length = _tmp200_ * _tmp201_;
+#line 383 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_tmp202_ = data_length;
+#line 383 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_tmp203_ = g_new0 (guint8, _tmp202_);
+#line 383 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							data = (g_free (data), NULL);
+#line 383 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							data = _tmp203_;
+#line 383 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							data_length1 = _tmp202_;
+#line 383 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_data_size_ = data_length1;
+#line 3051 "book.c"
 							{
 								gint row;
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 								row = 0;
+#line 3056 "book.c"
 								{
 									gboolean _tmp204_;
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									_tmp204_ = TRUE;
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									while (TRUE) {
+#line 3063 "book.c"
 										gboolean _tmp205_;
 										gint _tmp207_;
 										gint _tmp208_;
@@ -2064,32 +3070,57 @@ static void book_save_pdf (Book* self, GFile* file, GError** error) {
 										gint _tmp212_;
 										gint _tmp213_;
 										gint out_offset;
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										_tmp205_ = _tmp204_;
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										if (!_tmp205_) {
+#line 3078 "book.c"
 											gint _tmp206_;
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp206_ = row;
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											row = _tmp206_ + 1;
+#line 3084 "book.c"
 										}
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										_tmp204_ = FALSE;
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										_tmp207_ = row;
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										_tmp208_ = height;
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										if (!(_tmp207_ < _tmp208_)) {
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											break;
+#line 3096 "book.c"
 										}
+#line 386 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										_tmp209_ = row;
+#line 386 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										_tmp210_ = image;
+#line 386 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										_tmp211_ = gdk_pixbuf_get_rowstride (_tmp210_);
+#line 386 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										in_offset = _tmp209_ * _tmp211_;
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										_tmp212_ = row;
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										_tmp213_ = width;
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										out_offset = _tmp212_ * _tmp213_;
+#line 3112 "book.c"
 										{
 											gint x;
+#line 388 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											x = 0;
+#line 3117 "book.c"
 											{
 												gboolean _tmp214_;
+#line 388 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												_tmp214_ = TRUE;
+#line 388 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												while (TRUE) {
+#line 3124 "book.c"
 													gboolean _tmp215_;
 													gint _tmp217_;
 													gint _tmp218_;
@@ -2103,29 +3134,53 @@ static void book_save_pdf (Book* self, GFile* file, GError** error) {
 													gint _tmp224_;
 													guint8 _tmp225_;
 													guint8 _tmp226_;
+#line 388 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp215_ = _tmp214_;
+#line 388 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													if (!_tmp215_) {
+#line 3142 "book.c"
 														gint _tmp216_;
+#line 388 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														_tmp216_ = x;
+#line 388 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														x = _tmp216_ + 1;
+#line 3148 "book.c"
 													}
+#line 388 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp214_ = FALSE;
+#line 388 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp217_ = x;
+#line 388 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp218_ = width;
+#line 388 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													if (!(_tmp217_ < _tmp218_)) {
+#line 388 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														break;
+#line 3160 "book.c"
 													}
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp219_ = data;
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp219__length1 = data_length1;
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp220_ = out_offset;
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp221_ = x;
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp222_ = pixels;
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp222__length1 = pixels_length1;
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp223_ = in_offset;
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp224_ = x;
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp225_ = _tmp222_[_tmp223_ + (_tmp224_ * 3)];
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp219_[_tmp220_ + _tmp221_] = _tmp225_;
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp226_ = _tmp219_[_tmp220_ + _tmp221_];
+#line 3184 "book.c"
 												}
 											}
 										}
@@ -2135,421 +3190,801 @@ static void book_save_pdf (Book* self, GFile* file, GError** error) {
 						}
 					}
 				}
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp227_ = data;
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp227__length1 = data_length1;
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp229_ = book_compress_zlib (self, _tmp227_, _tmp227__length1, &_tmp228_);
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				compressed_data = _tmp229_;
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				compressed_data_length1 = _tmp228_;
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_compressed_data_size_ = compressed_data_length1;
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp230_ = compressed_data;
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp230__length1 = compressed_data_length1;
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (_tmp230_ != NULL) {
+#line 3212 "book.c"
 					gint _tmp231_;
-					const gchar* _tmp241_;
+					const gchar* _tmp243_;
+#line 398 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp231_ = depth;
+#line 398 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					if (_tmp231_ > 1) {
-						gsize jpeg_length = 0UL;
+#line 3219 "book.c"
 						GdkPixbuf* _tmp232_;
-						gsize _tmp233_ = 0UL;
-						gint _tmp234_ = 0;
-						guint8* _tmp235_ = NULL;
+						gint _tmp233_;
+						Page* _tmp234_;
+						gint _tmp235_ = 0;
+						gint _tmp236_ = 0;
+						guint8* _tmp237_ = NULL;
 						guint8* jpeg_data;
 						gint jpeg_data_length1;
 						gint _jpeg_data_size_;
-						gsize _tmp236_;
-						guint8* _tmp237_;
-						gint _tmp237__length1;
+						guint8* _tmp238_;
+						gint _tmp238__length1;
+						guint8* _tmp239_;
+						gint _tmp239__length1;
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_tmp232_ = image;
-						_tmp235_ = book_compress_jpeg (self, _tmp232_, &_tmp233_, &_tmp234_);
-						jpeg_length = _tmp233_;
-						jpeg_data = _tmp235_;
-						jpeg_data_length1 = _tmp234_;
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp233_ = quality;
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp234_ = page;
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp235_ = page_get_dpi (_tmp234_);
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp237_ = book_compress_jpeg (self, _tmp232_, _tmp233_, _tmp235_, &_tmp236_);
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						jpeg_data = _tmp237_;
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						jpeg_data_length1 = _tmp236_;
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_jpeg_data_size_ = jpeg_data_length1;
-						_tmp236_ = jpeg_length;
-						_tmp237_ = compressed_data;
-						_tmp237__length1 = compressed_data_length1;
-						if (_tmp236_ < ((gsize) _tmp237__length1)) {
-							gchar* _tmp238_;
-							guint8* _tmp239_;
-							gint _tmp239__length1;
-							guint8* _tmp240_;
-							gint _tmp240__length1;
-							_tmp238_ = g_strdup ("DCTDecode");
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp238_ = jpeg_data;
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp238__length1 = jpeg_data_length1;
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp239_ = compressed_data;
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp239__length1 = compressed_data_length1;
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						if (_tmp238__length1 < _tmp239__length1) {
+#line 3259 "book.c"
+							gchar* _tmp240_;
+							guint8* _tmp241_;
+							gint _tmp241__length1;
+							guint8* _tmp242_;
+							gint _tmp242__length1;
+#line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							_tmp240_ = g_strdup ("DCTDecode");
+#line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_g_free0 (filter);
-							filter = _tmp238_;
-							_tmp239_ = jpeg_data;
-							_tmp239__length1 = jpeg_data_length1;
-							_tmp240_ = (_tmp239_ != NULL) ? _vala_array_dup1 (_tmp239_, _tmp239__length1) : ((gpointer) _tmp239_);
-							_tmp240__length1 = _tmp239__length1;
+#line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							filter = _tmp240_;
+#line 404 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							_tmp241_ = jpeg_data;
+#line 404 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							_tmp241__length1 = jpeg_data_length1;
+#line 404 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							_tmp242_ = (_tmp241_ != NULL) ? _vala_array_dup1 (_tmp241_, _tmp241__length1) : ((gpointer) _tmp241_);
+#line 404 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							_tmp242__length1 = _tmp241__length1;
+#line 404 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							data = (g_free (data), NULL);
-							data = _tmp240_;
-							data_length1 = _tmp240__length1;
+#line 404 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							data = _tmp242_;
+#line 404 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							data_length1 = _tmp242__length1;
+#line 404 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_data_size_ = data_length1;
+#line 3287 "book.c"
 						}
+#line 398 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						jpeg_data = (g_free (jpeg_data), NULL);
+#line 3291 "book.c"
 					}
-					_tmp241_ = filter;
-					if (_tmp241_ == NULL) {
-						gchar* _tmp242_;
-						guint8* _tmp243_;
-						gint _tmp243__length1;
-						guint8* _tmp244_;
-						gint _tmp244__length1;
-						_tmp242_ = g_strdup ("FlateDecode");
+#line 408 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp243_ = filter;
+#line 408 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					if (_tmp243_ == NULL) {
+#line 3297 "book.c"
+						gchar* _tmp244_;
+						guint8* _tmp245_;
+						gint _tmp245__length1;
+						guint8* _tmp246_;
+						gint _tmp246__length1;
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp244_ = g_strdup ("FlateDecode");
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_g_free0 (filter);
-						filter = _tmp242_;
-						_tmp243_ = compressed_data;
-						_tmp243__length1 = compressed_data_length1;
-						_tmp244_ = (_tmp243_ != NULL) ? _vala_array_dup2 (_tmp243_, _tmp243__length1) : ((gpointer) _tmp243_);
-						_tmp244__length1 = _tmp243__length1;
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						filter = _tmp244_;
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp245_ = compressed_data;
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp245__length1 = compressed_data_length1;
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp246_ = (_tmp245_ != NULL) ? _vala_array_dup2 (_tmp245_, _tmp245__length1) : ((gpointer) _tmp245_);
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp246__length1 = _tmp245__length1;
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						data = (g_free (data), NULL);
-						data = _tmp244_;
-						data_length1 = _tmp244__length1;
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						data = _tmp246_;
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						data_length1 = _tmp246__length1;
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_data_size_ = data_length1;
+#line 3325 "book.c"
 					}
 				}
-				_tmp245_ = writer;
-				pdf_writer_write_string (_tmp245_, "\n");
-				_tmp246_ = writer;
-				_tmp247_ = pdf_writer_start_object (_tmp246_);
-				number = _tmp247_;
+#line 416 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp247_ = writer;
+#line 416 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp247_, "\n");
+#line 417 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp248_ = writer;
-				_tmp249_ = number;
-				_tmp250_ = g_strdup_printf ("%u 0 obj\n", _tmp249_);
-				_tmp251_ = _tmp250_;
-				pdf_writer_write_string (_tmp248_, _tmp251_);
-				_g_free0 (_tmp251_);
-				_tmp252_ = writer;
-				pdf_writer_write_string (_tmp252_, "<<\n");
-				_tmp253_ = writer;
-				pdf_writer_write_string (_tmp253_, "/Type /Page\n");
+#line 417 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp249_ = pdf_writer_start_object (_tmp248_);
+#line 417 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				number = _tmp249_;
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp250_ = writer;
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp251_ = number;
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp252_ = g_strdup_printf ("%u 0 obj\n", _tmp251_);
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp253_ = _tmp252_;
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp250_, _tmp253_);
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_free0 (_tmp253_);
+#line 419 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp254_ = writer;
-				_tmp255_ = pages_number;
-				_tmp256_ = g_strdup_printf ("/Parent %u 0 R\n", _tmp255_);
-				_tmp257_ = _tmp256_;
-				pdf_writer_write_string (_tmp254_, _tmp257_);
-				_g_free0 (_tmp257_);
-				_tmp258_ = writer;
-				_tmp259_ = i;
-				_tmp260_ = number;
-				_tmp261_ = g_strdup_printf ("/Resources << /XObject << /Im%d %u 0 R >> >>\n", _tmp259_, _tmp260_ + 1);
-				_tmp262_ = _tmp261_;
-				pdf_writer_write_string (_tmp258_, _tmp262_);
-				_g_free0 (_tmp262_);
-				_tmp263_ = writer;
-				_tmp264_ = page_width;
-				_tmp265_ = width_buffer;
-				_tmp265__length1 = width_buffer_length1;
-				_tmp266_ = g_ascii_formatd (_tmp265_, _tmp265__length1, "%.2f", _tmp264_);
-				_tmp267_ = page_height;
-				_tmp268_ = height_buffer;
-				_tmp268__length1 = height_buffer_length1;
-				_tmp269_ = g_ascii_formatd (_tmp268_, _tmp268__length1, "%.2f", _tmp267_);
-				_tmp270_ = g_strdup_printf ("/MediaBox [ 0 0 %s %s ]\n", _tmp266_, _tmp269_);
-				_tmp271_ = _tmp270_;
-				pdf_writer_write_string (_tmp263_, _tmp271_);
-				_g_free0 (_tmp271_);
-				_tmp272_ = writer;
-				_tmp273_ = number;
-				_tmp274_ = g_strdup_printf ("/Contents %u 0 R\n", _tmp273_ + 2);
-				_tmp275_ = _tmp274_;
-				pdf_writer_write_string (_tmp272_, _tmp275_);
-				_g_free0 (_tmp275_);
-				_tmp276_ = writer;
-				pdf_writer_write_string (_tmp276_, ">>\n");
-				_tmp277_ = writer;
-				pdf_writer_write_string (_tmp277_, "endobj\n");
+#line 419 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp254_, "<<\n");
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp255_ = writer;
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp255_, "/Type /Page\n");
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp256_ = writer;
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp257_ = pages_number;
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp258_ = g_strdup_printf ("/Parent %u 0 R\n", _tmp257_);
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp259_ = _tmp258_;
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp256_, _tmp259_);
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_free0 (_tmp259_);
+#line 422 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp260_ = writer;
+#line 422 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp261_ = i;
+#line 422 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp262_ = number;
+#line 422 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp263_ = g_strdup_printf ("/Resources << /XObject << /Im%d %u 0 R >> >>\n", _tmp261_, _tmp262_ + 1);
+#line 422 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp264_ = _tmp263_;
+#line 422 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp260_, _tmp264_);
+#line 422 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_free0 (_tmp264_);
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp265_ = writer;
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp266_ = page_width;
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp267_ = width_buffer;
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp267__length1 = width_buffer_length1;
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp268_ = g_ascii_formatd (_tmp267_, _tmp267__length1, "%.2f", _tmp266_);
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp269_ = page_height;
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp270_ = height_buffer;
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp270__length1 = height_buffer_length1;
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp271_ = g_ascii_formatd (_tmp270_, _tmp270__length1, "%.2f", _tmp269_);
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp272_ = g_strdup_printf ("/MediaBox [ 0 0 %s %s ]\n", _tmp268_, _tmp271_);
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp273_ = _tmp272_;
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp265_, _tmp273_);
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_free0 (_tmp273_);
+#line 424 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp274_ = writer;
+#line 424 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp275_ = number;
+#line 424 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp276_ = g_strdup_printf ("/Contents %u 0 R\n", _tmp275_ + 2);
+#line 424 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp277_ = _tmp276_;
+#line 424 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp274_, _tmp277_);
+#line 424 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_free0 (_tmp277_);
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp278_ = writer;
-				pdf_writer_write_string (_tmp278_, "\n");
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp278_, ">>\n");
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp279_ = writer;
-				_tmp280_ = pdf_writer_start_object (_tmp279_);
-				number = _tmp280_;
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp279_, "endobj\n");
+#line 429 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp280_ = writer;
+#line 429 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp280_, "\n");
+#line 430 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp281_ = writer;
-				_tmp282_ = number;
-				_tmp283_ = g_strdup_printf ("%u 0 obj\n", _tmp282_);
-				_tmp284_ = _tmp283_;
-				pdf_writer_write_string (_tmp281_, _tmp284_);
-				_g_free0 (_tmp284_);
-				_tmp285_ = writer;
-				pdf_writer_write_string (_tmp285_, "<<\n");
-				_tmp286_ = writer;
-				pdf_writer_write_string (_tmp286_, "/Type /XObject\n");
+#line 430 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp282_ = pdf_writer_start_object (_tmp281_);
+#line 430 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				number = _tmp282_;
+#line 431 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp283_ = writer;
+#line 431 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp284_ = number;
+#line 431 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp285_ = g_strdup_printf ("%u 0 obj\n", _tmp284_);
+#line 431 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp286_ = _tmp285_;
+#line 431 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp283_, _tmp286_);
+#line 431 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_free0 (_tmp286_);
+#line 432 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp287_ = writer;
-				pdf_writer_write_string (_tmp287_, "/Subtype /Image\n");
+#line 432 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp287_, "<<\n");
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp288_ = writer;
-				_tmp289_ = width;
-				_tmp290_ = g_strdup_printf ("/Width %d\n", _tmp289_);
-				_tmp291_ = _tmp290_;
-				pdf_writer_write_string (_tmp288_, _tmp291_);
-				_g_free0 (_tmp291_);
-				_tmp292_ = writer;
-				_tmp293_ = height;
-				_tmp294_ = g_strdup_printf ("/Height %d\n", _tmp293_);
-				_tmp295_ = _tmp294_;
-				pdf_writer_write_string (_tmp292_, _tmp295_);
-				_g_free0 (_tmp295_);
-				_tmp296_ = writer;
-				_tmp297_ = color_space;
-				_tmp298_ = g_strdup_printf ("/ColorSpace /%s\n", _tmp297_);
-				_tmp299_ = _tmp298_;
-				pdf_writer_write_string (_tmp296_, _tmp299_);
-				_g_free0 (_tmp299_);
-				_tmp300_ = writer;
-				_tmp301_ = depth;
-				_tmp302_ = g_strdup_printf ("/BitsPerComponent %d\n", _tmp301_);
-				_tmp303_ = _tmp302_;
-				pdf_writer_write_string (_tmp300_, _tmp303_);
-				_g_free0 (_tmp303_);
-				_tmp304_ = writer;
-				_tmp305_ = data;
-				_tmp305__length1 = data_length1;
-				_tmp306_ = g_strdup_printf ("/Length %d\n", _tmp305__length1);
-				_tmp307_ = _tmp306_;
-				pdf_writer_write_string (_tmp304_, _tmp307_);
-				_g_free0 (_tmp307_);
-				_tmp308_ = filter;
-				if (_tmp308_ != NULL) {
-					PDFWriter* _tmp309_;
-					const gchar* _tmp310_;
-					gchar* _tmp311_ = NULL;
-					gchar* _tmp312_;
-					_tmp309_ = writer;
-					_tmp310_ = filter;
-					_tmp311_ = g_strdup_printf ("/Filter /%s\n", _tmp310_);
-					_tmp312_ = _tmp311_;
-					pdf_writer_write_string (_tmp309_, _tmp312_);
-					_g_free0 (_tmp312_);
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp288_, "/Type /XObject\n");
+#line 434 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp289_ = writer;
+#line 434 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp289_, "/Subtype /Image\n");
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp290_ = writer;
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp291_ = width;
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp292_ = g_strdup_printf ("/Width %d\n", _tmp291_);
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp293_ = _tmp292_;
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp290_, _tmp293_);
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_free0 (_tmp293_);
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp294_ = writer;
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp295_ = height;
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp296_ = g_strdup_printf ("/Height %d\n", _tmp295_);
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp297_ = _tmp296_;
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp294_, _tmp297_);
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_free0 (_tmp297_);
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp298_ = writer;
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp299_ = color_space;
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp300_ = g_strdup_printf ("/ColorSpace /%s\n", _tmp299_);
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp301_ = _tmp300_;
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp298_, _tmp301_);
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_free0 (_tmp301_);
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp302_ = writer;
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp303_ = depth;
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp304_ = g_strdup_printf ("/BitsPerComponent %d\n", _tmp303_);
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp305_ = _tmp304_;
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp302_, _tmp305_);
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_free0 (_tmp305_);
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp306_ = writer;
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp307_ = data;
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp307__length1 = data_length1;
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp308_ = g_strdup_printf ("/Length %d\n", _tmp307__length1);
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp309_ = _tmp308_;
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp306_, _tmp309_);
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_free0 (_tmp309_);
+#line 440 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp310_ = filter;
+#line 440 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				if (_tmp310_ != NULL) {
+#line 3530 "book.c"
+					PDFWriter* _tmp311_;
+					const gchar* _tmp312_;
+					gchar* _tmp313_ = NULL;
+					gchar* _tmp314_;
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp311_ = writer;
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp312_ = filter;
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp313_ = g_strdup_printf ("/Filter /%s\n", _tmp312_);
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp314_ = _tmp313_;
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					pdf_writer_write_string (_tmp311_, _tmp314_);
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_g_free0 (_tmp314_);
+#line 3547 "book.c"
 				}
-				_tmp313_ = writer;
-				pdf_writer_write_string (_tmp313_, ">>\n");
-				_tmp314_ = writer;
-				pdf_writer_write_string (_tmp314_, "stream\n");
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp315_ = writer;
-				_tmp316_ = data;
-				_tmp316__length1 = data_length1;
-				pdf_writer_write (_tmp315_, _tmp316_, _tmp316__length1);
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp315_, ">>\n");
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp316_ = writer;
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp316_, "stream\n");
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp317_ = writer;
-				pdf_writer_write_string (_tmp317_, "\n");
-				_tmp318_ = writer;
-				pdf_writer_write_string (_tmp318_, "endstream\n");
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp318_ = data;
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp318__length1 = data_length1;
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write (_tmp317_, _tmp318_, _tmp318__length1);
+#line 445 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp319_ = writer;
-				pdf_writer_write_string (_tmp319_, "endobj\n");
-				_tmp320_ = page_width;
-				_tmp321_ = width_buffer;
-				_tmp321__length1 = width_buffer_length1;
-				_tmp322_ = g_ascii_formatd (_tmp321_, _tmp321__length1, "%f", _tmp320_);
-				_tmp323_ = page_height;
-				_tmp324_ = height_buffer;
-				_tmp324__length1 = height_buffer_length1;
-				_tmp325_ = g_ascii_formatd (_tmp324_, _tmp324__length1, "%f", _tmp323_);
-				_tmp326_ = i;
-				_tmp327_ = g_strdup_printf ("q\n%s 0 0 %s 0 0 cm\n/Im%d Do\nQ", _tmp322_, _tmp325_, _tmp326_);
-				command = _tmp327_;
-				_tmp328_ = writer;
-				pdf_writer_write_string (_tmp328_, "\n");
-				_tmp329_ = writer;
-				_tmp330_ = pdf_writer_start_object (_tmp329_);
-				number = _tmp330_;
+#line 445 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp319_, "\n");
+#line 446 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp320_ = writer;
+#line 446 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp320_, "endstream\n");
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp321_ = writer;
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp321_, "endobj\n");
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp322_ = page_width;
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp323_ = width_buffer;
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp323__length1 = width_buffer_length1;
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp324_ = g_ascii_formatd (_tmp323_, _tmp323__length1, "%f", _tmp322_);
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp325_ = page_height;
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp326_ = height_buffer;
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp326__length1 = height_buffer_length1;
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp327_ = g_ascii_formatd (_tmp326_, _tmp326__length1, "%f", _tmp325_);
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp328_ = i;
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp329_ = g_strdup_printf ("q\n%s 0 0 %s 0 0 cm\n/Im%d Do\nQ", _tmp324_, _tmp327_, _tmp328_);
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				command = _tmp329_;
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp330_ = writer;
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp330_, "\n");
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp331_ = writer;
-				_tmp332_ = number;
-				_tmp333_ = g_strdup_printf ("%u 0 obj\n", _tmp332_);
-				_tmp334_ = _tmp333_;
-				pdf_writer_write_string (_tmp331_, _tmp334_);
-				_g_free0 (_tmp334_);
-				_tmp335_ = writer;
-				pdf_writer_write_string (_tmp335_, "<<\n");
-				_tmp336_ = writer;
-				_tmp337_ = command;
-				_tmp338_ = strlen (_tmp337_);
-				_tmp339_ = _tmp338_;
-				_tmp340_ = g_strdup_printf ("/Length %d\n", _tmp339_ + 1);
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp332_ = pdf_writer_start_object (_tmp331_);
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				number = _tmp332_;
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp333_ = writer;
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp334_ = number;
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp335_ = g_strdup_printf ("%u 0 obj\n", _tmp334_);
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp336_ = _tmp335_;
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp333_, _tmp336_);
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_free0 (_tmp336_);
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp337_ = writer;
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp337_, "<<\n");
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp338_ = writer;
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp339_ = command;
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp340_ = strlen (_tmp339_);
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp341_ = _tmp340_;
-				pdf_writer_write_string (_tmp336_, _tmp341_);
-				_g_free0 (_tmp341_);
-				_tmp342_ = writer;
-				pdf_writer_write_string (_tmp342_, ">>\n");
-				_tmp343_ = writer;
-				pdf_writer_write_string (_tmp343_, "stream\n");
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp342_ = g_strdup_printf ("/Length %d\n", _tmp341_ + 1);
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp343_ = _tmp342_;
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp338_, _tmp343_);
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_free0 (_tmp343_);
+#line 456 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp344_ = writer;
-				_tmp345_ = command;
-				pdf_writer_write_string (_tmp344_, _tmp345_);
+#line 456 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp344_, ">>\n");
+#line 457 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp345_ = writer;
+#line 457 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp345_, "stream\n");
+#line 458 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp346_ = writer;
-				pdf_writer_write_string (_tmp346_, "\n");
-				_tmp347_ = writer;
-				pdf_writer_write_string (_tmp347_, "endstream\n");
+#line 458 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp347_ = command;
+#line 458 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp346_, _tmp347_);
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp348_ = writer;
-				pdf_writer_write_string (_tmp348_, "endobj\n");
-				_tmp349_ = i;
-				g_signal_emit_by_name (self, "saving", _tmp349_);
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp348_, "\n");
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp349_ = writer;
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp349_, "endstream\n");
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp350_ = writer;
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp350_, "endobj\n");
+#line 463 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp351_ = i;
+#line 463 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				g_signal_emit_by_name (self, "saving", _tmp351_);
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_g_free0 (command);
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				compressed_data = (g_free (compressed_data), NULL);
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				data = (g_free (data), NULL);
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				height_buffer = (g_free (height_buffer), NULL);
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				width_buffer = (g_free (width_buffer), NULL);
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_g_free0 (filter);
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_g_free0 (color_space);
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_g_object_unref0 (image);
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_page_unref0 (page);
+#line 3689 "book.c"
 			}
 		}
 	}
-	_tmp350_ = writer;
-	pdf_writer_write_string (_tmp350_, "\n");
-	_tmp351_ = writer;
-	_tmp352_ = pdf_writer_start_object (_tmp351_);
-	info_number = _tmp352_;
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp352_ = writer;
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp352_, "\n");
+#line 468 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp353_ = writer;
-	_tmp354_ = info_number;
-	_tmp355_ = g_strdup_printf ("%u 0 obj\n", _tmp354_);
-	_tmp356_ = _tmp355_;
-	pdf_writer_write_string (_tmp353_, _tmp356_);
-	_g_free0 (_tmp356_);
-	_tmp357_ = writer;
-	pdf_writer_write_string (_tmp357_, "<<\n");
-	_tmp358_ = writer;
-	_tmp359_ = g_strdup_printf ("/Creator (Simple Scan %s)\n", VERSION);
-	_tmp360_ = _tmp359_;
-	pdf_writer_write_string (_tmp358_, _tmp360_);
-	_g_free0 (_tmp360_);
-	_tmp361_ = writer;
-	pdf_writer_write_string (_tmp361_, ">>\n");
-	_tmp362_ = writer;
-	pdf_writer_write_string (_tmp362_, "endobj\n");
+#line 468 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp354_ = pdf_writer_start_object (_tmp353_);
+#line 468 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	info_number = _tmp354_;
+#line 469 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp355_ = writer;
+#line 469 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp356_ = info_number;
+#line 469 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp357_ = g_strdup_printf ("%u 0 obj\n", _tmp356_);
+#line 469 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp358_ = _tmp357_;
+#line 469 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp355_, _tmp358_);
+#line 469 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_free0 (_tmp358_);
+#line 470 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp359_ = writer;
+#line 470 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp359_, "<<\n");
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp360_ = writer;
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp361_ = g_strdup_printf ("/Creator (Simple Scan %s)\n", VERSION);
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp362_ = _tmp361_;
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp360_, _tmp362_);
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_free0 (_tmp362_);
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp363_ = writer;
-	_tmp364_ = _tmp363_->offset;
-	xref_offset = _tmp364_;
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp363_, ">>\n");
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp364_ = writer;
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp364_, "endobj\n");
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp365_ = writer;
-	pdf_writer_write_string (_tmp365_, "xref\n");
-	_tmp366_ = writer;
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp366_ = _tmp365_->offset;
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	xref_offset = _tmp366_;
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp367_ = writer;
-	_tmp368_ = _tmp367_->object_offsets;
-	_tmp369_ = g_list_length (_tmp368_);
-	_tmp370_ = g_strdup_printf ("1 %zu\n", (gsize) _tmp369_);
-	_tmp371_ = _tmp370_;
-	pdf_writer_write_string (_tmp366_, _tmp371_);
-	_g_free0 (_tmp371_);
-	_tmp372_ = writer;
-	_tmp373_ = _tmp372_->object_offsets;
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp367_, "xref\n");
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp368_ = writer;
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp369_ = writer;
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp370_ = _tmp369_->object_offsets;
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp371_ = g_list_length (_tmp370_);
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp372_ = g_strdup_printf ("1 %zu\n", (gsize) _tmp371_);
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp373_ = _tmp372_;
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp368_, _tmp373_);
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_free0 (_tmp373_);
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp374_ = writer;
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp375_ = _tmp374_->object_offsets;
+#line 3767 "book.c"
 	{
 		GList* offset_collection = NULL;
 		GList* offset_it = NULL;
-		offset_collection = _tmp373_;
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+		offset_collection = _tmp375_;
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		for (offset_it = offset_collection; offset_it != NULL; offset_it = offset_it->next) {
+#line 3775 "book.c"
 			guint offset = 0U;
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			offset = (guint) ((guintptr) offset_it->data);
+#line 3779 "book.c"
 			{
-				PDFWriter* _tmp374_;
-				guint _tmp375_;
-				gchar* _tmp376_ = NULL;
-				gchar* _tmp377_;
-				_tmp374_ = writer;
-				_tmp375_ = offset;
-				_tmp376_ = g_strdup_printf ("%010zu 00000 n \n", (gsize) _tmp375_);
-				_tmp377_ = _tmp376_;
-				pdf_writer_write_string (_tmp374_, _tmp377_);
-				_g_free0 (_tmp377_);
+				PDFWriter* _tmp376_;
+				guint _tmp377_;
+				gchar* _tmp378_ = NULL;
+				gchar* _tmp379_;
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp376_ = writer;
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp377_ = offset;
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp378_ = g_strdup_printf ("%010zu 00000 n \n", (gsize) _tmp377_);
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp379_ = _tmp378_;
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp376_, _tmp379_);
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_free0 (_tmp379_);
+#line 3797 "book.c"
 			}
 		}
 	}
-	_tmp378_ = writer;
-	pdf_writer_write_string (_tmp378_, "trailer\n");
-	_tmp379_ = writer;
-	pdf_writer_write_string (_tmp379_, "<<\n");
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp380_ = writer;
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp380_, "trailer\n");
+#line 484 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp381_ = writer;
-	_tmp382_ = _tmp381_->object_offsets;
-	_tmp383_ = g_list_length (_tmp382_);
-	_tmp384_ = g_strdup_printf ("/Size %zu\n", (gsize) _tmp383_);
-	_tmp385_ = _tmp384_;
-	pdf_writer_write_string (_tmp380_, _tmp385_);
-	_g_free0 (_tmp385_);
-	_tmp386_ = writer;
-	_tmp387_ = info_number;
-	_tmp388_ = g_strdup_printf ("/Info %u 0 R\n", _tmp387_);
-	_tmp389_ = _tmp388_;
-	pdf_writer_write_string (_tmp386_, _tmp389_);
-	_g_free0 (_tmp389_);
-	_tmp390_ = writer;
-	_tmp391_ = catalog_number;
-	_tmp392_ = g_strdup_printf ("/Root %u 0 R\n", _tmp391_);
-	_tmp393_ = _tmp392_;
-	pdf_writer_write_string (_tmp390_, _tmp393_);
-	_g_free0 (_tmp393_);
-	_tmp394_ = writer;
-	pdf_writer_write_string (_tmp394_, ">>\n");
-	_tmp395_ = writer;
-	pdf_writer_write_string (_tmp395_, "startxref\n");
+#line 484 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp381_, "<<\n");
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp382_ = writer;
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp383_ = writer;
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp384_ = _tmp383_->object_offsets;
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp385_ = g_list_length (_tmp384_);
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp386_ = g_strdup_printf ("/Size %zu\n", (gsize) _tmp385_);
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp387_ = _tmp386_;
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp382_, _tmp387_);
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_free0 (_tmp387_);
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp388_ = writer;
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp389_ = info_number;
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp390_ = g_strdup_printf ("/Info %u 0 R\n", _tmp389_);
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp391_ = _tmp390_;
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp388_, _tmp391_);
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_free0 (_tmp391_);
+#line 487 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp392_ = writer;
+#line 487 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp393_ = catalog_number;
+#line 487 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp394_ = g_strdup_printf ("/Root %u 0 R\n", _tmp393_);
+#line 487 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp395_ = _tmp394_;
+#line 487 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp392_, _tmp395_);
+#line 487 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_free0 (_tmp395_);
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp396_ = writer;
-	_tmp397_ = xref_offset;
-	_tmp398_ = g_strdup_printf ("%zu\n", _tmp397_);
-	_tmp399_ = _tmp398_;
-	pdf_writer_write_string (_tmp396_, _tmp399_);
-	_g_free0 (_tmp399_);
-	_tmp400_ = writer;
-	pdf_writer_write_string (_tmp400_, "%%EOF\n");
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp396_, ">>\n");
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp397_ = writer;
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp397_, "startxref\n");
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp398_ = writer;
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp399_ = xref_offset;
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp400_ = g_strdup_printf ("%zu\n", _tmp399_);
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp401_ = _tmp400_;
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp398_, _tmp401_);
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_free0 (_tmp401_);
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp402_ = writer;
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp402_, "%%EOF\n");
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_pdf_writer_unref0 (writer);
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_object_unref0 (stream);
+#line 3877 "book.c"
 }
 
 
-void book_save (Book* self, const gchar* type, GFile* file, GError** error) {
+void book_save (Book* self, const gchar* type, gint quality, GFile* file, GError** error) {
 	const gchar* _tmp0_;
 	const gchar* _tmp1_;
 	GQuark _tmp3_ = 0U;
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	static GQuark _tmp2_label0 = 0;
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	static GQuark _tmp2_label1 = 0;
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	static GQuark _tmp2_label2 = 0;
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	static GQuark _tmp2_label3 = 0;
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	static GQuark _tmp2_label4 = 0;
+#line 3895 "book.c"
 	GError * _inner_error_ = NULL;
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (type != NULL);
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (file != NULL);
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = type;
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = _tmp0_;
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3_ = (NULL == _tmp1_) ? 0 : g_quark_from_string (_tmp1_);
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (((_tmp3_ == ((0 != _tmp2_label0) ? _tmp2_label0 : (_tmp2_label0 = g_quark_from_static_string ("jpeg")))) || (_tmp3_ == ((0 != _tmp2_label1) ? _tmp2_label1 : (_tmp2_label1 = g_quark_from_static_string ("png"))))) || (_tmp3_ == ((0 != _tmp2_label2) ? _tmp2_label2 : (_tmp2_label2 = g_quark_from_static_string ("tiff"))))) {
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		switch (0) {
+#line 3913 "book.c"
 			default:
 			{
 				const gchar* _tmp4_;
-				GFile* _tmp5_;
+				gint _tmp5_;
+				GFile* _tmp6_;
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp4_ = type;
-				_tmp5_ = file;
-				book_save_multi_file (self, _tmp4_, _tmp5_, &_inner_error_);
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp5_ = quality;
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp6_ = file;
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				book_save_multi_file (self, _tmp4_, _tmp5_, _tmp6_, &_inner_error_);
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (_inner_error_ != NULL) {
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					g_propagate_error (error, _inner_error_);
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					return;
+#line 3933 "book.c"
 				}
+#line 503 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				break;
+#line 3937 "book.c"
 			}
 		}
 	} else if (_tmp3_ == ((0 != _tmp2_label3) ? _tmp2_label3 : (_tmp2_label3 = g_quark_from_static_string ("ps")))) {
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		switch (0) {
+#line 3943 "book.c"
 			default:
 			{
-				GFile* _tmp6_;
-				_tmp6_ = file;
-				book_save_ps (self, _tmp6_, &_inner_error_);
+				GFile* _tmp7_;
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp7_ = file;
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				book_save_ps (self, _tmp7_, &_inner_error_);
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (_inner_error_ != NULL) {
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					g_propagate_error (error, _inner_error_);
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					return;
+#line 3957 "book.c"
 				}
+#line 506 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				break;
+#line 3961 "book.c"
 			}
 		}
 	} else if (_tmp3_ == ((0 != _tmp2_label4) ? _tmp2_label4 : (_tmp2_label4 = g_quark_from_static_string ("pdf")))) {
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		switch (0) {
+#line 3967 "book.c"
 			default:
 			{
-				GFile* _tmp7_;
-				_tmp7_ = file;
-				book_save_pdf (self, _tmp7_, &_inner_error_);
+				GFile* _tmp8_;
+				gint _tmp9_;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp8_ = file;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp9_ = quality;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				book_save_pdf (self, _tmp8_, _tmp9_, &_inner_error_);
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (_inner_error_ != NULL) {
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					g_propagate_error (error, _inner_error_);
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					return;
+#line 3984 "book.c"
 				}
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				break;
+#line 3988 "book.c"
 			}
 		}
 	}
@@ -2562,15 +3997,25 @@ void book_set_needs_saving (Book* self, gboolean needs_saving) {
 	gboolean _tmp1_;
 	gboolean _tmp2_;
 	gboolean _tmp3_;
+#line 513 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = self->priv->needs_saving;
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	needed_saving = _tmp0_;
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = needs_saving;
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->priv->needs_saving = _tmp1_;
+#line 517 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = needed_saving;
+#line 517 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3_ = needs_saving;
+#line 517 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (_tmp2_ != _tmp3_) {
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_signal_emit_by_name (self, "needs-saving-changed");
+#line 4019 "book.c"
 	}
 }
 
@@ -2578,10 +4023,15 @@ void book_set_needs_saving (Book* self, gboolean needs_saving) {
 gboolean book_get_needs_saving (Book* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_;
+#line 521 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = self->priv->needs_saving;
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	result = _tmp0_;
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
+#line 4035 "book.c"
 }
 
 
@@ -2592,178 +4042,293 @@ static void g_cclosure_user_marshal_VOID__PAGE (GClosure * closure, GValue * ret
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (n_param_values == 2);
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		data1 = closure->data;
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		data2 = param_values->data[0].v_pointer;
+#line 4054 "book.c"
 	} else {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		data1 = param_values->data[0].v_pointer;
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		data2 = closure->data;
+#line 4060 "book.c"
 	}
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	callback = (GMarshalFunc_VOID__PAGE) (marshal_data ? marshal_data : cc->callback);
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	callback (data1, value_get_page (param_values + 1), data2);
+#line 4066 "book.c"
 }
 
 
 static void value_book_init (GValue* value) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	value->data[0].v_pointer = NULL;
+#line 4073 "book.c"
 }
 
 
 static void value_book_free_value (GValue* value) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (value->data[0].v_pointer) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		book_unref (value->data[0].v_pointer);
+#line 4082 "book.c"
 	}
 }
 
 
 static void value_book_copy_value (const GValue* src_value, GValue* dest_value) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (src_value->data[0].v_pointer) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		dest_value->data[0].v_pointer = book_ref (src_value->data[0].v_pointer);
+#line 4092 "book.c"
 	} else {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		dest_value->data[0].v_pointer = NULL;
+#line 4096 "book.c"
 	}
 }
 
 
 static gpointer value_book_peek_pointer (const GValue* value) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return value->data[0].v_pointer;
+#line 4104 "book.c"
 }
 
 
 static gchar* value_book_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (collect_values[0].v_pointer) {
+#line 4111 "book.c"
 		Book* object;
 		object = collect_values[0].v_pointer;
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (object->parent_instance.g_class == NULL) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+#line 4118 "book.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+#line 4122 "book.c"
 		}
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = book_ref (object);
+#line 4126 "book.c"
 	} else {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
+#line 4130 "book.c"
 	}
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return NULL;
+#line 4134 "book.c"
 }
 
 
 static gchar* value_book_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	Book** object_p;
 	object_p = collect_values[0].v_pointer;
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (!object_p) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
+#line 4145 "book.c"
 	}
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (!value->data[0].v_pointer) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = NULL;
+#line 4151 "book.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = value->data[0].v_pointer;
+#line 4155 "book.c"
 	} else {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = book_ref (value->data[0].v_pointer);
+#line 4159 "book.c"
 	}
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return NULL;
+#line 4163 "book.c"
 }
 
 
 GParamSpec* param_spec_book (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecBook* spec;
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_BOOK), NULL);
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return G_PARAM_SPEC (spec);
+#line 4177 "book.c"
 }
 
 
 gpointer value_get_book (const GValue* value) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BOOK), NULL);
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return value->data[0].v_pointer;
+#line 4186 "book.c"
 }
 
 
 void value_set_book (GValue* value, gpointer v_object) {
 	Book* old;
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BOOK));
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	old = value->data[0].v_pointer;
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (v_object) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_BOOK));
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = v_object;
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		book_ref (value->data[0].v_pointer);
+#line 4206 "book.c"
 	} else {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
+#line 4210 "book.c"
 	}
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (old) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		book_unref (old);
+#line 4216 "book.c"
 	}
 }
 
 
 void value_take_book (GValue* value, gpointer v_object) {
 	Book* old;
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BOOK));
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	old = value->data[0].v_pointer;
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (v_object) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_BOOK));
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = v_object;
+#line 4235 "book.c"
 	} else {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
+#line 4239 "book.c"
 	}
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (old) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		book_unref (old);
+#line 4245 "book.c"
 	}
 }
 
 
 static void book_class_init (BookClass * klass) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	book_parent_class = g_type_class_peek_parent (klass);
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	BOOK_CLASS (klass)->finalize = book_finalize;
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_type_class_add_private (klass, sizeof (BookPrivate));
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_new ("page_added", TYPE_BOOK, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__PAGE, G_TYPE_NONE, 1, TYPE_PAGE);
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_new ("page_removed", TYPE_BOOK, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__PAGE, G_TYPE_NONE, 1, TYPE_PAGE);
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_new ("reordered", TYPE_BOOK, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_new ("cleared", TYPE_BOOK, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_new ("needs_saving_changed", TYPE_BOOK, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_new ("saving", TYPE_BOOK, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT);
+#line 4269 "book.c"
 }
 
 
 static void book_instance_init (Book * self) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->priv = BOOK_GET_PRIVATE (self);
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->ref_count = 1;
+#line 4278 "book.c"
 }
 
 
 static void book_finalize (Book* obj) {
 	Book * self;
 	GList* _tmp0_;
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BOOK, Book);
+#line 32 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = self->priv->pages;
+#line 4289 "book.c"
 	{
 		GList* page_collection = NULL;
 		GList* page_it = NULL;
+#line 32 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		page_collection = _tmp0_;
+#line 32 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		for (page_it = page_collection; page_it != NULL; page_it = page_it->next) {
+#line 4297 "book.c"
 			Page* _tmp1_;
 			Page* page = NULL;
+#line 32 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			_tmp1_ = _page_ref0 ((Page*) page_it->data);
+#line 32 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			page = _tmp1_;
+#line 4304 "book.c"
 			{
 				Page* _tmp2_;
 				guint _tmp3_ = 0U;
 				Page* _tmp4_;
 				guint _tmp5_ = 0U;
+#line 34 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp2_ = page;
+#line 34 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				g_signal_parse_name ("pixels-changed", TYPE_PAGE, &_tmp3_, NULL, FALSE);
+#line 34 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _book_page_changed_cb_page_pixels_changed, self);
+#line 35 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp4_ = page;
+#line 35 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				g_signal_parse_name ("crop-changed", TYPE_PAGE, &_tmp5_, NULL, FALSE);
+#line 35 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _book_page_changed_cb_page_crop_changed, self);
+#line 32 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_page_unref0 (page);
+#line 4324 "book.c"
 			}
 		}
 	}
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	__g_list_free__page_unref0_0 (self->priv->pages);
+#line 182 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_byte_array_unref0 (self->priv->jpeg_data);
+#line 4332 "book.c"
 }
 
 
@@ -2784,23 +4349,32 @@ GType book_get_type (void) {
 gpointer book_ref (gpointer instance) {
 	Book* self;
 	self = instance;
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_atomic_int_inc (&self->ref_count);
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return instance;
+#line 4357 "book.c"
 }
 
 
 void book_unref (gpointer instance) {
 	Book* self;
 	self = instance;
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		BOOK_GET_CLASS (self)->finalize (self);
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_type_free_instance ((GTypeInstance *) self);
+#line 4370 "book.c"
 	}
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return self ? g_object_ref (self) : NULL;
+#line 4378 "book.c"
 }
 
 
@@ -2808,18 +4382,28 @@ PDFWriter* pdf_writer_construct (GType object_type, GFileOutputStream* stream) {
 	PDFWriter* self = NULL;
 	GFileOutputStream* _tmp0_;
 	GFileOutputStream* _tmp1_;
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (stream != NULL, NULL);
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self = (PDFWriter*) g_type_create_instance (object_type);
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = stream;
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_object_unref0 (self->priv->stream);
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->priv->stream = _tmp1_;
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return self;
+#line 4400 "book.c"
 }
 
 
 PDFWriter* pdf_writer_new (GFileOutputStream* stream) {
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return pdf_writer_construct (TYPE_PDF_WRITER, stream);
+#line 4407 "book.c"
 }
 
 
@@ -2828,42 +4412,67 @@ void pdf_writer_write (PDFWriter* self, guint8* data, int data_length1) {
 	guint8* _tmp5_;
 	gint _tmp5__length1;
 	GError * _inner_error_ = NULL;
+#line 538 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
+#line 4418 "book.c"
 	{
 		GFileOutputStream* _tmp0_;
 		guint8* _tmp1_;
 		gint _tmp1__length1;
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp0_ = self->priv->stream;
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp1_ = data;
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp1__length1 = data_length1;
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_output_stream_write_all ((GOutputStream*) _tmp0_, _tmp1_, (gsize) _tmp1__length1, NULL, NULL, &_inner_error_);
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (_inner_error_ != NULL) {
-			goto __catch0_g_error;
+#line 4433 "book.c"
+			goto __catch1_g_error;
 		}
 	}
-	goto __finally0;
-	__catch0_g_error:
+	goto __finally1;
+	__catch1_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp2_;
 		const gchar* _tmp3_;
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		e = _inner_error_;
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_inner_error_ = NULL;
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp2_ = e;
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp3_ = _tmp2_->message;
-		g_warning ("book.vala:562: Error writing PDF: %s", _tmp3_);
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+		g_warning ("book.vala:546: Error writing PDF: %s", _tmp3_);
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_g_error_free0 (e);
+#line 4455 "book.c"
 	}
-	__finally0:
+	__finally1:
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (_inner_error_ != NULL) {
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_clear_error (&_inner_error_);
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return;
+#line 4466 "book.c"
 	}
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp4_ = self->offset;
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_ = data;
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5__length1 = data_length1;
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->offset = _tmp4_ + _tmp5__length1;
+#line 4476 "book.c"
 }
 
 
@@ -2882,27 +4491,49 @@ static gchar* string_to_utf8 (const gchar* self, int* result_length1) {
 	gint _tmp6_;
 	gchar* _tmp7_;
 	gint _tmp7__length1;
+#line 1267 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
+#line 1268 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
+#line 1268 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
+#line 1268 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp2_ = g_new0 (gchar, _tmp1_ + 1);
+#line 1268 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
+#line 1268 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_result__length1 = _tmp1_ + 1;
+#line 1268 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	__result__size_ = _result__length1;
+#line 1269 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp3_ = _result__length1;
+#line 1269 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_result__length1 = _tmp3_ - 1;
+#line 1270 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp4_ = _result_;
+#line 1270 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp4__length1 = _result__length1;
+#line 1270 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp5_ = strlen (self);
+#line 1270 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp6_ = _tmp5_;
+#line 1270 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	memcpy (_tmp4_, self, (gsize) _tmp6_);
+#line 1271 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp7_ = _result_;
+#line 1271 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp7__length1 = _result__length1;
+#line 1271 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	if (result_length1) {
+#line 1271 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp7__length1;
+#line 4531 "book.c"
 	}
+#line 1271 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	result = _tmp7_;
+#line 1271 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	return result;
+#line 4537 "book.c"
 }
 
 
@@ -2912,14 +4543,23 @@ void pdf_writer_write_string (PDFWriter* self, const gchar* text) {
 	gchar* _tmp2_ = NULL;
 	guint8* _tmp3_;
 	gint _tmp3__length1;
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (text != NULL);
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = text;
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = string_to_utf8 (_tmp0_, &_tmp1_);
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3_ = (guint8*) _tmp2_;
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3__length1 = (_tmp1_ * sizeof (gchar)) / sizeof (guint8);
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write (self, _tmp3_, (_tmp1_ * sizeof (gchar)) / sizeof (guint8));
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3_ = (g_free (_tmp3_), NULL);
+#line 4563 "book.c"
 }
 
 
@@ -2928,145 +4568,235 @@ guint pdf_writer_start_object (PDFWriter* self) {
 	gsize _tmp0_;
 	GList* _tmp1_;
 	guint _tmp2_ = 0U;
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (self != NULL, 0U);
+#line 558 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = self->offset;
+#line 558 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->object_offsets = g_list_append (self->object_offsets, (gpointer) ((guintptr) ((guint) _tmp0_)));
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = self->object_offsets;
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = g_list_length (_tmp1_);
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	result = _tmp2_;
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
+#line 4586 "book.c"
 }
 
 
 static void value_pdf_writer_init (GValue* value) {
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	value->data[0].v_pointer = NULL;
+#line 4593 "book.c"
 }
 
 
 static void value_pdf_writer_free_value (GValue* value) {
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (value->data[0].v_pointer) {
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		pdf_writer_unref (value->data[0].v_pointer);
+#line 4602 "book.c"
 	}
 }
 
 
 static void value_pdf_writer_copy_value (const GValue* src_value, GValue* dest_value) {
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (src_value->data[0].v_pointer) {
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		dest_value->data[0].v_pointer = pdf_writer_ref (src_value->data[0].v_pointer);
+#line 4612 "book.c"
 	} else {
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		dest_value->data[0].v_pointer = NULL;
+#line 4616 "book.c"
 	}
 }
 
 
 static gpointer value_pdf_writer_peek_pointer (const GValue* value) {
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return value->data[0].v_pointer;
+#line 4624 "book.c"
 }
 
 
 static gchar* value_pdf_writer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (collect_values[0].v_pointer) {
+#line 4631 "book.c"
 		PDFWriter* object;
 		object = collect_values[0].v_pointer;
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (object->parent_instance.g_class == NULL) {
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+#line 4638 "book.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+#line 4642 "book.c"
 		}
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = pdf_writer_ref (object);
+#line 4646 "book.c"
 	} else {
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
+#line 4650 "book.c"
 	}
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return NULL;
+#line 4654 "book.c"
 }
 
 
 static gchar* value_pdf_writer_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PDFWriter** object_p;
 	object_p = collect_values[0].v_pointer;
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (!object_p) {
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
+#line 4665 "book.c"
 	}
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (!value->data[0].v_pointer) {
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = NULL;
+#line 4671 "book.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = value->data[0].v_pointer;
+#line 4675 "book.c"
 	} else {
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = pdf_writer_ref (value->data[0].v_pointer);
+#line 4679 "book.c"
 	}
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return NULL;
+#line 4683 "book.c"
 }
 
 
 GParamSpec* param_spec_pdf_writer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecPDFWriter* spec;
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_PDF_WRITER), NULL);
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return G_PARAM_SPEC (spec);
+#line 4697 "book.c"
 }
 
 
 gpointer value_get_pdf_writer (const GValue* value) {
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PDF_WRITER), NULL);
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return value->data[0].v_pointer;
+#line 4706 "book.c"
 }
 
 
 void value_set_pdf_writer (GValue* value, gpointer v_object) {
 	PDFWriter* old;
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PDF_WRITER));
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	old = value->data[0].v_pointer;
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (v_object) {
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PDF_WRITER));
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = v_object;
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		pdf_writer_ref (value->data[0].v_pointer);
+#line 4726 "book.c"
 	} else {
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
+#line 4730 "book.c"
 	}
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (old) {
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		pdf_writer_unref (old);
+#line 4736 "book.c"
 	}
 }
 
 
 void value_take_pdf_writer (GValue* value, gpointer v_object) {
 	PDFWriter* old;
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PDF_WRITER));
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	old = value->data[0].v_pointer;
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (v_object) {
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PDF_WRITER));
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = v_object;
+#line 4755 "book.c"
 	} else {
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
+#line 4759 "book.c"
 	}
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (old) {
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		pdf_writer_unref (old);
+#line 4765 "book.c"
 	}
 }
 
 
 static void pdf_writer_class_init (PDFWriterClass * klass) {
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_parent_class = g_type_class_peek_parent (klass);
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	PDF_WRITER_CLASS (klass)->finalize = pdf_writer_finalize;
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_type_class_add_private (klass, sizeof (PDFWriterPrivate));
+#line 4777 "book.c"
 }
 
 
 static void pdf_writer_instance_init (PDFWriter * self) {
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->priv = PDF_WRITER_GET_PRIVATE (self);
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->offset = (gsize) 0;
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->ref_count = 1;
+#line 4788 "book.c"
 }
 
 
 static void pdf_writer_finalize (PDFWriter* obj) {
 	PDFWriter * self;
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PDF_WRITER, PDFWriter);
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_list_free0 (self->object_offsets);
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_object_unref0 (self->priv->stream);
+#line 4800 "book.c"
 }
 
 
@@ -3087,17 +4817,24 @@ GType pdf_writer_get_type (void) {
 gpointer pdf_writer_ref (gpointer instance) {
 	PDFWriter* self;
 	self = instance;
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_atomic_int_inc (&self->ref_count);
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return instance;
+#line 4825 "book.c"
 }
 
 
 void pdf_writer_unref (gpointer instance) {
 	PDFWriter* self;
 	self = instance;
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		PDF_WRITER_GET_CLASS (self)->finalize (self);
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_type_free_instance ((GTypeInstance *) self);
+#line 4838 "book.c"
 	}
 }
 
@@ -3105,7 +4842,9 @@ void pdf_writer_unref (gpointer instance) {
 static cairo_status_t _ps_writer_write_cairo_data_cairo_write_func_t (gpointer self, guchar* data, int data_length1) {
 	cairo_status_t result;
 	result = ps_writer_write_cairo_data (self, data, data_length1);
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
+#line 4848 "book.c"
 }
 
 
@@ -3114,192 +4853,309 @@ PsWriter* ps_writer_construct (GType object_type, GFileOutputStream* stream) {
 	GFileOutputStream* _tmp0_;
 	GFileOutputStream* _tmp1_;
 	cairo_surface_t* _tmp2_;
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (stream != NULL, NULL);
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self = (PsWriter*) g_type_create_instance (object_type);
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = stream;
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_object_unref0 (self->stream);
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->stream = _tmp1_;
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = cairo_ps_surface_create_for_stream (_ps_writer_write_cairo_data_cairo_write_func_t, self, (gdouble) 0, (gdouble) 0);
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_cairo_surface_destroy0 (self->surface);
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->surface = _tmp2_;
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return self;
+#line 4877 "book.c"
 }
 
 
 PsWriter* ps_writer_new (GFileOutputStream* stream) {
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return ps_writer_construct (TYPE_PS_WRITER, stream);
+#line 4884 "book.c"
 }
 
 
 static cairo_status_t ps_writer_write_cairo_data (PsWriter* self, guint8* data, int data_length1) {
 	cairo_status_t result = 0;
 	GError * _inner_error_ = NULL;
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (self != NULL, 0);
+#line 4893 "book.c"
 	{
 		GFileOutputStream* _tmp0_;
 		guint8* _tmp1_;
 		gint _tmp1__length1;
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp0_ = self->stream;
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp1_ = data;
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp1__length1 = data_length1;
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_output_stream_write_all ((GOutputStream*) _tmp0_, _tmp1_, (gsize) _tmp1__length1, NULL, NULL, &_inner_error_);
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (_inner_error_ != NULL) {
-			goto __catch1_g_error;
+#line 4908 "book.c"
+			goto __catch2_g_error;
 		}
 	}
-	goto __finally1;
-	__catch1_g_error:
+	goto __finally2;
+	__catch2_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp2_;
 		const gchar* _tmp3_;
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		e = _inner_error_;
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_inner_error_ = NULL;
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp2_ = e;
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp3_ = _tmp2_->message;
-		g_warning ("book.vala:598: Error writing data: %s", _tmp3_);
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+		g_warning ("book.vala:582: Error writing data: %s", _tmp3_);
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		result = CAIRO_STATUS_WRITE_ERROR;
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_g_error_free0 (e);
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return result;
+#line 4934 "book.c"
 	}
-	__finally1:
+	__finally2:
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (_inner_error_ != NULL) {
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_clear_error (&_inner_error_);
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return 0;
+#line 4945 "book.c"
 	}
+#line 586 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	result = CAIRO_STATUS_SUCCESS;
+#line 586 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
+#line 4951 "book.c"
 }
 
 
 static void value_ps_writer_init (GValue* value) {
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	value->data[0].v_pointer = NULL;
+#line 4958 "book.c"
 }
 
 
 static void value_ps_writer_free_value (GValue* value) {
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (value->data[0].v_pointer) {
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		ps_writer_unref (value->data[0].v_pointer);
+#line 4967 "book.c"
 	}
 }
 
 
 static void value_ps_writer_copy_value (const GValue* src_value, GValue* dest_value) {
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (src_value->data[0].v_pointer) {
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		dest_value->data[0].v_pointer = ps_writer_ref (src_value->data[0].v_pointer);
+#line 4977 "book.c"
 	} else {
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		dest_value->data[0].v_pointer = NULL;
+#line 4981 "book.c"
 	}
 }
 
 
 static gpointer value_ps_writer_peek_pointer (const GValue* value) {
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return value->data[0].v_pointer;
+#line 4989 "book.c"
 }
 
 
 static gchar* value_ps_writer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (collect_values[0].v_pointer) {
+#line 4996 "book.c"
 		PsWriter* object;
 		object = collect_values[0].v_pointer;
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (object->parent_instance.g_class == NULL) {
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+#line 5003 "book.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+#line 5007 "book.c"
 		}
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = ps_writer_ref (object);
+#line 5011 "book.c"
 	} else {
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
+#line 5015 "book.c"
 	}
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return NULL;
+#line 5019 "book.c"
 }
 
 
 static gchar* value_ps_writer_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PsWriter** object_p;
 	object_p = collect_values[0].v_pointer;
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (!object_p) {
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
+#line 5030 "book.c"
 	}
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (!value->data[0].v_pointer) {
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = NULL;
+#line 5036 "book.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = value->data[0].v_pointer;
+#line 5040 "book.c"
 	} else {
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = ps_writer_ref (value->data[0].v_pointer);
+#line 5044 "book.c"
 	}
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return NULL;
+#line 5048 "book.c"
 }
 
 
 GParamSpec* param_spec_ps_writer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecPsWriter* spec;
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_PS_WRITER), NULL);
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return G_PARAM_SPEC (spec);
+#line 5062 "book.c"
 }
 
 
 gpointer value_get_ps_writer (const GValue* value) {
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PS_WRITER), NULL);
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return value->data[0].v_pointer;
+#line 5071 "book.c"
 }
 
 
 void value_set_ps_writer (GValue* value, gpointer v_object) {
 	PsWriter* old;
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PS_WRITER));
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	old = value->data[0].v_pointer;
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (v_object) {
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PS_WRITER));
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = v_object;
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		ps_writer_ref (value->data[0].v_pointer);
+#line 5091 "book.c"
 	} else {
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
+#line 5095 "book.c"
 	}
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (old) {
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		ps_writer_unref (old);
+#line 5101 "book.c"
 	}
 }
 
 
 void value_take_ps_writer (GValue* value, gpointer v_object) {
 	PsWriter* old;
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PS_WRITER));
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	old = value->data[0].v_pointer;
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (v_object) {
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PS_WRITER));
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = v_object;
+#line 5120 "book.c"
 	} else {
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
+#line 5124 "book.c"
 	}
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (old) {
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		ps_writer_unref (old);
+#line 5130 "book.c"
 	}
 }
 
 
 static void ps_writer_class_init (PsWriterClass * klass) {
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	ps_writer_parent_class = g_type_class_peek_parent (klass);
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	PS_WRITER_CLASS (klass)->finalize = ps_writer_finalize;
+#line 5140 "book.c"
 }
 
 
 static void ps_writer_instance_init (PsWriter * self) {
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->ref_count = 1;
+#line 5147 "book.c"
 }
 
 
 static void ps_writer_finalize (PsWriter* obj) {
 	PsWriter * self;
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PS_WRITER, PsWriter);
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_cairo_surface_destroy0 (self->surface);
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_object_unref0 (self->stream);
+#line 5159 "book.c"
 }
 
 
@@ -3320,19 +5176,44 @@ GType ps_writer_get_type (void) {
 gpointer ps_writer_ref (gpointer instance) {
 	PsWriter* self;
 	self = instance;
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_atomic_int_inc (&self->ref_count);
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return instance;
+#line 5184 "book.c"
 }
 
 
 void ps_writer_unref (gpointer instance) {
 	PsWriter* self;
 	self = instance;
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		PS_WRITER_GET_CLASS (self)->finalize (self);
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_type_free_instance ((GTypeInstance *) self);
+#line 5197 "book.c"
+	}
+}
+
+
+static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+	if ((array != NULL) && (destroy_func != NULL)) {
+		int i;
+		for (i = 0; i < array_length; i = i + 1) {
+			if (((gpointer*) array)[i] != NULL) {
+				destroy_func (((gpointer*) array)[i]);
+			}
+		}
 	}
 }
 
 
+static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+	_vala_array_destroy (array, array_length, destroy_func);
+	g_free (array);
+}
+
+
 
diff --git a/src/book.vala b/src/book.vala
index 6740fcb..a4e6cdd 100644
--- a/src/book.vala
+++ b/src/book.vala
@@ -113,16 +113,18 @@ public class Book
             suffix = basename.slice (extension_index, basename.length);
             prefix = uri.slice (0, uri.length - suffix.length);
         }
-
-        return File.new_for_uri ("%s-%d%s".printf (prefix, i+1, suffix));
+        var width = get_n_pages ().to_string().length;
+        var number_format = "%%0%dd".printf (width);
+        var filename = prefix + "-" + number_format.printf (i + 1) + suffix;
+        return File.new_for_uri (filename);
     }
 
-    private void save_multi_file (string type, File file) throws Error
+    private void save_multi_file (string type, int quality, File file) throws Error
     {
         for (var i = 0; i < get_n_pages (); i++)
         {
             var page = get_page (i);
-            page.save (type, make_indexed_file (file.get_uri (), i));
+            page.save (type, quality, make_indexed_file (file.get_uri (), i));
             saving (i);
         }
     }
@@ -177,50 +179,33 @@ public class Book
         return out_data;
     }
 
-    private static void jpeg_init_cb (JPEG.Compress info) {}
-    private static bool jpeg_empty_cb (JPEG.Compress info) { return true; }
-    private static void jpeg_term_cb (JPEG.Compress info) {}
+    private ByteArray jpeg_data;
 
-    private uint8[] compress_jpeg (Gdk.Pixbuf image, out size_t n_written)
+    private uint8[] compress_jpeg (Gdk.Pixbuf image, int quality, int dpi)
     {
-        var info = JPEG.Compress ();
-        var jerr = JPEG.ErrorManager ();
-        var dest_mgr = JPEG.DestinationManager ();
-
-        info.err = jerr.std_error ();
-        info.create_compress ();
-
-        info.image_width = image.get_width ();
-        info.image_height = image.get_height ();
-        info.input_components = 3;
-        info.in_color_space = JPEG.ColorSpace.RGB; /* TODO: JCS_GRAYSCALE? */
-        info.set_defaults ();
-
-        var max_length = info.image_width * info.image_height * info.input_components;
-        var data = new uint8[max_length];
-        dest_mgr.next_output_byte = data;
-        dest_mgr.free_in_buffer = max_length;
-        dest_mgr.init_destination = jpeg_init_cb;
-        dest_mgr.empty_output_buffer = jpeg_empty_cb;
-        dest_mgr.term_destination = jpeg_term_cb;
-        info.dest = &dest_mgr;
-
-        info.start_compress (true);
-        unowned uint8[] pixels = image.get_pixels ();
-        for (var r = 0; r < info.image_height; r++)
+        jpeg_data = new ByteArray ();
+        string[] keys = { "quality", "density-unit", "x-density", "y-density", null };
+        string[] values = { "%d".printf (quality), "dots-per-inch", "%d".printf (dpi), "%d".printf (dpi), null };
+        try
+        {
+            image.save_to_callbackv (write_pixbuf_data, "jpeg", keys, values);
+        }
+        catch (Error e)
         {
-            uint8* row[1];
-            row[0] = (uint8*) pixels + r * image.get_rowstride ();
-            info.write_scanlines (row, 1);
         }
-        info.finish_compress ();
-        n_written = max_length - dest_mgr.free_in_buffer;
-        data.resize ((int) n_written);
+        var data = (owned) jpeg_data.data;
+        jpeg_data = null;
 
         return data;
     }
 
-    private void save_pdf (File file) throws Error
+    private bool write_pixbuf_data (uint8[] buf) throws Error
+    {
+        jpeg_data.append (buf);
+        return true;
+    }
+
+    private void save_pdf (File file, int quality) throws Error
     {
         var stream = file.replace (null, false, FileCreateFlags.NONE, null);
         var writer = new PDFWriter (stream);
@@ -412,9 +397,8 @@ public class Book
                 /* Try if JPEG compression is better */
                 if (depth > 1)
                 {
-                    size_t jpeg_length;
-                    var jpeg_data = compress_jpeg (image, out jpeg_length);
-                    if (jpeg_length < compressed_data.length)
+                    var jpeg_data = compress_jpeg (image, quality, page.get_dpi ());
+                    if (jpeg_data.length < compressed_data.length)
                     {
                         filter = "DCTDecode";
                         data = jpeg_data;
@@ -484,7 +468,7 @@ public class Book
         var info_number = writer.start_object ();
         writer.write_string ("%u 0 obj\n".printf (info_number));
         writer.write_string ("<<\n");
-        writer.write_string ("/Creator (Simple Scan %s)\n".printf (Config.VERSION));
+        writer.write_string ("/Creator (Simple Scan %s)\n".printf (VERSION));
         writer.write_string (">>\n");
         writer.write_string ("endobj\n");
 
@@ -508,20 +492,20 @@ public class Book
         writer.write_string ("%%EOF\n");
     }
 
-    public void save (string type, File file) throws Error
+    public void save (string type, int quality, File file) throws Error
     {
         switch (type)
         {
         case "jpeg":
         case "png":
         case "tiff":
-            save_multi_file (type, file);
+            save_multi_file (type, quality, file);
             break;
         case "ps":
             save_ps (file);
             break;
         case "pdf":
-            save_pdf (file);
+            save_pdf (file, quality);
             break;
         }
     }
diff --git a/src/config.vapi b/src/config.vapi
index c326020..e6efeda 100644
--- a/src/config.vapi
+++ b/src/config.vapi
@@ -1,10 +1,7 @@
-[CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "config.h")]
-namespace Config
-{
-  public const string PKGDATADIR;
-  public const string LOCALE_DIR;
-  public const string GETTEXT_PACKAGE;
-  public const string VERSION;
-  public const string UI_DIR;
-  public const string ICON_DIR;
-}
+[CCode (cprefix = "", lower_case_cprefix = "")]
+public const string PKGDATADIR;
+public const string LOCALE_DIR;
+public const string GETTEXT_PACKAGE;
+public const string VERSION;
+public const string UI_DIR;
+public const string ICON_DIR;
diff --git a/src/jpeglib.vapi b/src/jpeglib.vapi
deleted file mode 100644
index 3022b5b..0000000
--- a/src/jpeglib.vapi
+++ /dev/null
@@ -1,57 +0,0 @@
-[CCode (cheader_filename = "jpeglib.h", cprefix = "jpeg_")]
-namespace JPEG {
-    [CCode (cprefix = "JCS_")]
-    public enum ColorSpace
-    {
-        UNKNOWN,
-        GRAYSCALE,
-        RGB,
-        YCbCr,
-        CMYK,
-        YCCK
-    }
-
-    public ErrorManager std_error (out ErrorManager err);
-
-    [CCode (cname = "struct jpeg_compress_struct", cprefix = "jpeg_", destroy_function = "jpeg_destroy_compress")]
-    public struct Compress
-    {
-        public DestinationManager* dest;
-        public int image_width;
-        public int image_height;
-        public int input_components;
-        public ColorSpace in_color_space;
-        public ErrorManager* err;
-
-        public void create_compress ();
-        public void set_defaults ();
-        public void start_compress (bool write_all_tables);
-        public void write_scanlines ([CCode (array_length = false)] uint8*[] scanlines, int num_Lines);
-        public void finish_compress ();
-    }
-
-    [CCode (cname = "struct jpeg_error_mgr")]
-    public struct ErrorManager
-    {
-        [CCode (cname = "jpeg_std_error")]
-        public ErrorManager* std_error ();
-    }
-
-    [CCode (has_target = false)]
-    public delegate void InitDestinationFunc (Compress cinfo);
-    [CCode (has_target = false)]
-    public delegate bool EmptyOutputBufferFunc (Compress cinfo);
-    [CCode (has_target = false)]
-    public delegate void TermDestinationFunc (Compress cinfo);
-
-    [CCode (cname = "struct jpeg_destination_mgr")]
-    public struct DestinationManager
-    {
-        [CCode (array_length = false)]
-        public unowned uint8[] next_output_byte;
-        public int free_in_buffer;
-        public InitDestinationFunc init_destination;
-        public EmptyOutputBufferFunc empty_output_buffer;
-        public TermDestinationFunc term_destination;
-    }
-}
diff --git a/src/page-view.c b/src/page-view.c
index e18691e..7e770a7 100644
--- a/src/page-view.c
+++ b/src/page-view.c
@@ -1,4 +1,4 @@
-/* page-view.c generated by valac 0.18.1, the Vala compiler
+/* page-view.c generated by valac 0.20.1, the Vala compiler
  * generated from page-view.vala, do not modify */
 
 /*
@@ -211,32 +211,44 @@ GType crop_location_get_type (void) {
 
 
 static void _page_view_page_pixels_changed_cb_page_pixels_changed (Page* _sender, gpointer self) {
+#line 85 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	page_view_page_pixels_changed_cb (self, _sender);
+#line 217 "page-view.c"
 }
 
 
 static void _page_view_page_size_changed_cb_page_size_changed (Page* _sender, gpointer self) {
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	page_view_page_size_changed_cb (self, _sender);
+#line 224 "page-view.c"
 }
 
 
 static void _page_view_page_overlay_changed_cb_page_crop_changed (Page* _sender, gpointer self) {
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	page_view_page_overlay_changed_cb (self, _sender);
+#line 231 "page-view.c"
 }
 
 
 static void _page_view_page_overlay_changed_cb_page_scan_line_changed (Page* _sender, gpointer self) {
+#line 88 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	page_view_page_overlay_changed_cb (self, _sender);
+#line 238 "page-view.c"
 }
 
 
 static void _page_view_scan_direction_changed_cb_page_scan_direction_changed (Page* _sender, gpointer self) {
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	page_view_scan_direction_changed_cb (self, _sender);
+#line 245 "page-view.c"
 }
 
 
 static gpointer _page_ref0 (gpointer self) {
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return self ? page_ref (self) : NULL;
+#line 252 "page-view.c"
 }
 
 
@@ -249,28 +261,48 @@ PageView* page_view_construct (GType object_type, Page* page) {
 	Page* _tmp4_;
 	Page* _tmp5_;
 	Page* _tmp6_;
+#line 73 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (page != NULL, NULL);
+#line 73 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self = (PageView*) g_type_create_instance (object_type);
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = page;
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = _page_ref0 (_tmp0_);
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_page_unref0 (self->priv->page);
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->page = _tmp1_;
+#line 76 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = page;
+#line 76 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_connect (_tmp2_, "pixels-changed", (GCallback) _page_view_page_pixels_changed_cb_page_pixels_changed, self);
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp3_ = page;
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_connect (_tmp3_, "size-changed", (GCallback) _page_view_page_size_changed_cb_page_size_changed, self);
+#line 78 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp4_ = page;
+#line 78 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_connect (_tmp4_, "crop-changed", (GCallback) _page_view_page_overlay_changed_cb_page_crop_changed, self);
+#line 79 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp5_ = page;
+#line 79 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_connect (_tmp5_, "scan-line-changed", (GCallback) _page_view_page_overlay_changed_cb_page_scan_line_changed, self);
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp6_ = page;
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_connect (_tmp6_, "scan-direction-changed", (GCallback) _page_view_scan_direction_changed_cb_page_scan_direction_changed, self);
+#line 73 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return self;
+#line 299 "page-view.c"
 }
 
 
 PageView* page_view_new (Page* page) {
+#line 73 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return page_view_construct (TYPE_PAGE_VIEW, page);
+#line 306 "page-view.c"
 }
 
 
@@ -278,11 +310,17 @@ Page* page_view_get_page (PageView* self) {
 	Page* result = NULL;
 	Page* _tmp0_;
 	Page* _tmp1_;
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, NULL);
+#line 94 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = self->priv->page;
+#line 94 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = _page_ref0 (_tmp0_);
+#line 94 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	result = _tmp1_;
+#line 94 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
+#line 324 "page-view.c"
 }
 
 
@@ -293,94 +331,153 @@ void page_view_set_selected (PageView* self, gboolean selected) {
 	gboolean _tmp4_;
 	gboolean _tmp9_;
 	gboolean _tmp10_;
+#line 97 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = self->priv->selected;
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp2_) {
+#line 341 "page-view.c"
 		gboolean _tmp3_;
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp3_ = selected;
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp1_ = _tmp3_;
+#line 347 "page-view.c"
 	} else {
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp1_ = FALSE;
+#line 351 "page-view.c"
 	}
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp4_ = _tmp1_;
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp4_) {
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp0_ = TRUE;
+#line 359 "page-view.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
 		gboolean _tmp6_;
 		gboolean _tmp8_;
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp6_ = self->priv->selected;
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if (!_tmp6_) {
+#line 368 "page-view.c"
 			gboolean _tmp7_;
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp7_ = selected;
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp5_ = !_tmp7_;
+#line 374 "page-view.c"
 		} else {
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp5_ = FALSE;
+#line 378 "page-view.c"
 		}
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp8_ = _tmp5_;
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp0_ = _tmp8_;
+#line 384 "page-view.c"
 	}
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp9_ = _tmp0_;
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp9_) {
+#line 100 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return;
+#line 392 "page-view.c"
 	}
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp10_ = selected;
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->selected = _tmp10_;
+#line 102 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "changed");
+#line 400 "page-view.c"
 }
 
 
 gboolean page_view_get_selected (PageView* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_;
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = self->priv->selected;
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	result = _tmp0_;
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
+#line 415 "page-view.c"
 }
 
 
 void page_view_set_x_offset (PageView* self, gint offset) {
 	gint _tmp0_;
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = offset;
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->x_offset = _tmp0_;
+#line 427 "page-view.c"
 }
 
 
 void page_view_set_y_offset (PageView* self, gint offset) {
 	gint _tmp0_;
+#line 115 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = offset;
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->y_offset = _tmp0_;
+#line 439 "page-view.c"
 }
 
 
 gint page_view_get_x_offset (PageView* self) {
 	gint result = 0;
 	gint _tmp0_;
+#line 120 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, 0);
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = self->priv->x_offset;
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	result = _tmp0_;
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
+#line 454 "page-view.c"
 }
 
 
 gint page_view_get_y_offset (PageView* self) {
 	gint result = 0;
 	gint _tmp0_;
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, 0);
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = self->priv->y_offset;
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	result = _tmp0_;
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
+#line 469 "page-view.c"
 }
 
 
 static guchar page_view_get_sample (PageView* self, guchar* pixels, int pixels_length1, gint offset, gint x, gint depth, gint sample) {
 	guchar result = '\0';
+#line 130 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, '\0');
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	result = (guchar) 0xFF;
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
+#line 481 "page-view.c"
 }
 
 
@@ -439,16 +536,27 @@ static void page_view_get_pixel (PageView* self, Page* page, gint x, gint y, guc
 	gint _tmp126_;
 	guchar _tmp127_ = '\0';
 	guchar _tmp128_;
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (page != NULL);
+#line 138 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = page;
+#line 138 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = page_get_scan_direction (_tmp0_);
+#line 138 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	switch (_tmp1_) {
+#line 138 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case SCAN_DIRECTION_TOP_TO_BOTTOM:
+#line 552 "page-view.c"
 		{
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
+#line 556 "page-view.c"
 		}
+#line 138 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case SCAN_DIRECTION_BOTTOM_TO_TOP:
+#line 560 "page-view.c"
 		{
 			Page* _tmp2_;
 			gint _tmp3_ = 0;
@@ -456,17 +564,29 @@ static void page_view_get_pixel (PageView* self, Page* page, gint x, gint y, guc
 			Page* _tmp5_;
 			gint _tmp6_ = 0;
 			gint _tmp7_;
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp2_ = page;
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp3_ = page_get_scan_width (_tmp2_);
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp4_ = x;
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			x = (_tmp3_ - _tmp4_) - 1;
+#line 144 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp5_ = page;
+#line 144 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp6_ = page_get_scan_height (_tmp5_);
+#line 144 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp7_ = y;
+#line 144 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			y = (_tmp6_ - _tmp7_) - 1;
+#line 145 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
+#line 586 "page-view.c"
 		}
+#line 138 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case SCAN_DIRECTION_LEFT_TO_RIGHT:
+#line 590 "page-view.c"
 		{
 			gint _tmp8_;
 			gint t;
@@ -474,17 +594,29 @@ static void page_view_get_pixel (PageView* self, Page* page, gint x, gint y, guc
 			gint _tmp10_ = 0;
 			gint _tmp11_;
 			gint _tmp12_;
+#line 147 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp8_ = x;
+#line 147 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			t = _tmp8_;
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp9_ = page;
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp10_ = page_get_scan_width (_tmp9_);
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp11_ = y;
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			x = (_tmp10_ - _tmp11_) - 1;
+#line 149 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp12_ = t;
+#line 149 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			y = _tmp12_;
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
+#line 616 "page-view.c"
 		}
+#line 138 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case SCAN_DIRECTION_RIGHT_TO_LEFT:
+#line 620 "page-view.c"
 		{
 			gint _tmp13_;
 			gint t;
@@ -492,44 +624,82 @@ static void page_view_get_pixel (PageView* self, Page* page, gint x, gint y, guc
 			Page* _tmp15_;
 			gint _tmp16_ = 0;
 			gint _tmp17_;
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp13_ = x;
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			t = _tmp13_;
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp14_ = y;
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			x = _tmp14_;
+#line 154 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp15_ = page;
+#line 154 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp16_ = page_get_scan_height (_tmp15_);
+#line 154 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp17_ = t;
+#line 154 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			y = (_tmp16_ - _tmp17_) - 1;
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
+#line 646 "page-view.c"
 		}
 		default:
+#line 138 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		break;
+#line 651 "page-view.c"
 	}
+#line 158 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp18_ = page;
+#line 158 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp19_ = page_get_depth (_tmp18_);
+#line 158 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	depth = _tmp19_;
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp20_ = page;
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp21_ = page_get_n_channels (_tmp20_);
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	n_channels = _tmp21_;
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp22_ = page;
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp24_ = page_get_pixels (_tmp22_, &_tmp23_);
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	pixels = _tmp24_;
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	pixels_length1 = _tmp23_;
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_pixels_size_ = pixels_length1;
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp25_ = page;
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp26_ = page_get_rowstride (_tmp25_);
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp27_ = y;
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	offset = _tmp26_ * _tmp27_;
+#line 164 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp29_ = depth;
+#line 164 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp29_ == 8) {
+#line 687 "page-view.c"
 		gint _tmp30_;
+#line 164 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp30_ = n_channels;
+#line 164 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp28_ = _tmp30_ == 3;
+#line 693 "page-view.c"
 	} else {
+#line 164 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp28_ = FALSE;
+#line 697 "page-view.c"
 	}
+#line 164 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp31_ = _tmp28_;
+#line 164 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp31_) {
+#line 703 "page-view.c"
 		gint _tmp32_;
 		gint _tmp33_;
 		gint _tmp34_;
@@ -555,49 +725,90 @@ static void page_view_get_pixel (PageView* self, Page* page, gint x, gint y, guc
 		gint _tmp47_;
 		guchar _tmp48_;
 		guchar _tmp49_;
+#line 166 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp32_ = offset;
+#line 166 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp33_ = x;
+#line 166 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp34_ = n_channels;
+#line 166 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		o = _tmp32_ + (_tmp33_ * _tmp34_);
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp35_ = pixel;
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp35__length1 = pixel_length1;
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp36_ = pixels;
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp36__length1 = pixels_length1;
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp37_ = o;
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp38_ = _tmp36_[_tmp37_];
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp35_[0] = _tmp38_;
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp39_ = _tmp35_[0];
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp40_ = pixel;
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp40__length1 = pixel_length1;
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp41_ = pixels;
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp41__length1 = pixels_length1;
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp42_ = o;
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp43_ = _tmp41_[_tmp42_ + 1];
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp40_[1] = _tmp43_;
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp44_ = _tmp40_[1];
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp45_ = pixel;
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp45__length1 = pixel_length1;
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp46_ = pixels;
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp46__length1 = pixels_length1;
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp47_ = o;
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp48_ = _tmp46_[_tmp47_ + 2];
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp45_[2] = _tmp48_;
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp49_ = _tmp45_[2];
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return;
+#line 787 "page-view.c"
 	} else {
 		gboolean _tmp50_ = FALSE;
 		gint _tmp51_;
 		gboolean _tmp53_;
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp51_ = depth;
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if (_tmp51_ == 8) {
+#line 796 "page-view.c"
 			gint _tmp52_;
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp52_ = n_channels;
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp50_ = _tmp52_ == 1;
+#line 802 "page-view.c"
 		} else {
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp50_ = FALSE;
+#line 806 "page-view.c"
 		}
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp53_ = _tmp50_;
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if (_tmp53_) {
+#line 812 "page-view.c"
 			guchar* _tmp54_;
 			gint _tmp54__length1;
 			guchar* _tmp55_;
@@ -612,38 +823,68 @@ static void page_view_get_pixel (PageView* self, Page* page, gint x, gint y, guc
 			guchar _tmp61_;
 			guchar _tmp62_;
 			guchar _tmp63_;
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp54_ = pixel;
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp54__length1 = pixel_length1;
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp55_ = pixel;
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp55__length1 = pixel_length1;
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp56_ = pixel;
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp56__length1 = pixel_length1;
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp57_ = pixels;
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp57__length1 = pixels_length1;
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp58_ = offset;
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp59_ = x;
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp60_ = _tmp57_[_tmp58_ + _tmp59_];
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp56_[2] = _tmp60_;
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp61_ = _tmp56_[2];
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp55_[1] = _tmp61_;
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp62_ = _tmp55_[1];
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp54_[0] = _tmp62_;
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp63_ = _tmp54_[0];
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			return;
+#line 863 "page-view.c"
 		} else {
 			gboolean _tmp64_ = FALSE;
 			gint _tmp65_;
 			gboolean _tmp67_;
+#line 179 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp65_ = depth;
+#line 179 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			if (_tmp65_ == 1) {
+#line 872 "page-view.c"
 				gint _tmp66_;
+#line 179 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp66_ = n_channels;
+#line 179 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp64_ = _tmp66_ == 1;
+#line 878 "page-view.c"
 			} else {
+#line 179 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp64_ = FALSE;
+#line 882 "page-view.c"
 			}
+#line 179 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp67_ = _tmp64_;
+#line 179 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			if (_tmp67_) {
+#line 888 "page-view.c"
 				gint _tmp68_;
 				gint _tmp69_;
 				gint o;
@@ -663,47 +904,86 @@ static void page_view_get_pixel (PageView* self, Page* page, gint x, gint y, guc
 				guchar _tmp79_;
 				guchar _tmp80_;
 				guchar _tmp81_;
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp68_ = offset;
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp69_ = x;
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				o = _tmp68_ + (_tmp69_ / 8);
+#line 182 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp71_ = pixels;
+#line 182 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp71__length1 = pixels_length1;
+#line 182 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp72_ = o;
+#line 182 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp73_ = _tmp71_[_tmp72_];
+#line 182 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp74_ = x;
+#line 182 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				if (((gint) (_tmp73_ & (0x80 >> (_tmp74_ % 8)))) != 0) {
+#line 182 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp70_ = 0x00;
+#line 928 "page-view.c"
 				} else {
+#line 182 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp70_ = 0xFF;
+#line 932 "page-view.c"
 				}
+#line 182 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp75_ = pixel;
+#line 182 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp75__length1 = pixel_length1;
+#line 182 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp76_ = pixel;
+#line 182 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp76__length1 = pixel_length1;
+#line 182 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp77_ = pixel;
+#line 182 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp77__length1 = pixel_length1;
+#line 182 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp78_ = _tmp70_;
+#line 182 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp77_[2] = (guchar) _tmp78_;
+#line 182 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp79_ = _tmp77_[2];
+#line 182 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp76_[1] = _tmp79_;
+#line 182 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp80_ = _tmp76_[1];
+#line 182 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp75_[0] = _tmp80_;
+#line 182 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp81_ = _tmp75_[0];
+#line 183 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				return;
+#line 962 "page-view.c"
 			} else {
 				gboolean _tmp82_ = FALSE;
 				gint _tmp83_;
 				gboolean _tmp85_;
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp83_ = depth;
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				if (_tmp83_ == 2) {
+#line 971 "page-view.c"
 					gint _tmp84_;
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp84_ = n_channels;
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp82_ = _tmp84_ == 1;
+#line 977 "page-view.c"
 				} else {
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp82_ = FALSE;
+#line 981 "page-view.c"
 				}
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp85_ = _tmp82_;
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				if (_tmp85_) {
+#line 987 "page-view.c"
 					gint _tmp86_[4] = {0};
 					gint block_shift[4];
 					gint _tmp87_;
@@ -727,77 +1007,146 @@ static void page_view_get_pixel (PageView* self, Page* page, gint x, gint y, guc
 					guchar _tmp99_;
 					guchar _tmp100_;
 					guchar _tmp101_;
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp86_[0] = 6;
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp86_[1] = 4;
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp86_[2] = 2;
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp86_[3] = 0;
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					memcpy (block_shift, _tmp86_, 4 * sizeof (gint));
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp87_ = offset;
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp88_ = x;
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					o = _tmp87_ + (_tmp88_ / 4);
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp89_ = pixels;
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp89__length1 = pixels_length1;
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp90_ = o;
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp91_ = _tmp89_[_tmp90_];
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp92_ = x;
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp93_ = block_shift[_tmp92_ % 4];
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					sample = (_tmp91_ >> _tmp93_) & 0x3;
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp94_ = sample;
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					sample = (_tmp94_ * 255) / 3;
+#line 195 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp95_ = pixel;
+#line 195 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp95__length1 = pixel_length1;
+#line 195 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp96_ = pixel;
+#line 195 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp96__length1 = pixel_length1;
+#line 195 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp97_ = pixel;
+#line 195 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp97__length1 = pixel_length1;
+#line 195 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp98_ = sample;
+#line 195 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp97_[2] = (guchar) _tmp98_;
+#line 195 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp99_ = _tmp97_[2];
+#line 195 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp96_[1] = _tmp99_;
+#line 195 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp100_ = _tmp96_[1];
+#line 195 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp95_[0] = _tmp100_;
+#line 195 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp101_ = _tmp95_[0];
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					return;
+#line 1073 "page-view.c"
 				}
 			}
 		}
 	}
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp102_ = pixel;
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp102__length1 = pixel_length1;
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp103_ = pixels;
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp103__length1 = pixels_length1;
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp104_ = offset;
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp105_ = x;
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp106_ = depth;
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp107_ = x;
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp108_ = n_channels;
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp109_ = page_view_get_sample (self, _tmp103_, _tmp103__length1, _tmp104_, _tmp105_, _tmp106_, _tmp107_ * _tmp108_);
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp102_[0] = _tmp109_;
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp110_ = _tmp102_[0];
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp111_ = pixel;
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp111__length1 = pixel_length1;
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp112_ = pixels;
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp112__length1 = pixels_length1;
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp113_ = offset;
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp114_ = x;
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp115_ = depth;
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp116_ = x;
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp117_ = n_channels;
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp118_ = page_view_get_sample (self, _tmp112_, _tmp112__length1, _tmp113_, _tmp114_, _tmp115_, (_tmp116_ * _tmp117_) + 1);
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp111_[1] = _tmp118_;
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp119_ = _tmp111_[1];
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp120_ = pixel;
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp120__length1 = pixel_length1;
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp121_ = pixels;
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp121__length1 = pixels_length1;
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp122_ = offset;
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp123_ = x;
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp124_ = depth;
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp125_ = x;
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp126_ = n_channels;
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp127_ = page_view_get_sample (self, _tmp121_, _tmp121__length1, _tmp122_, _tmp123_, _tmp124_, (_tmp125_ * _tmp126_) + 2);
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp120_[2] = _tmp127_;
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp128_ = _tmp120_[2];
+#line 1150 "page-view.c"
 }
 
 
@@ -862,68 +1211,125 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 	gdouble _tmp417_;
 	gdouble _tmp418_;
 	guchar _tmp419_;
+#line 205 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
+#line 205 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (page != NULL);
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = l;
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	L = (gint) _tmp0_;
+#line 252 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = L;
+#line 252 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = l;
+#line 252 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (((gdouble) _tmp1_) != _tmp2_) {
+#line 1229 "page-view.c"
 		gint _tmp3_;
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp3_ = L;
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		L = _tmp3_ + 1;
+#line 1235 "page-view.c"
 	}
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp4_ = r;
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	R = (gint) _tmp4_;
+#line 255 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp5_ = t;
+#line 255 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	T = (gint) _tmp5_;
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp6_ = T;
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp7_ = t;
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (((gdouble) _tmp6_) != _tmp7_) {
+#line 1251 "page-view.c"
 		gint _tmp8_;
+#line 257 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp8_ = T;
+#line 257 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		T = _tmp8_ + 1;
+#line 1257 "page-view.c"
 	}
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp9_ = b;
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	B = (gint) _tmp9_;
+#line 260 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	red = 0.0;
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	green = 0.0;
+#line 262 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	blue = 0.0;
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp12_ = r;
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp13_ = l;
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if ((_tmp12_ - _tmp13_) <= 1.0) {
+#line 1275 "page-view.c"
 		gdouble _tmp14_;
 		gdouble _tmp15_;
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp14_ = r;
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp15_ = l;
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp11_ = ((gint) _tmp14_) == ((gint) _tmp15_);
+#line 1284 "page-view.c"
 	} else {
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp11_ = FALSE;
+#line 1288 "page-view.c"
 	}
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp16_ = _tmp11_;
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp16_) {
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp10_ = TRUE;
+#line 1296 "page-view.c"
 	} else {
 		gboolean _tmp17_ = FALSE;
 		gdouble _tmp18_;
 		gdouble _tmp19_;
 		gboolean _tmp22_;
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp18_ = b;
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp19_ = t;
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if ((_tmp18_ - _tmp19_) <= 1.0) {
+#line 1308 "page-view.c"
 			gdouble _tmp20_;
 			gdouble _tmp21_;
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp20_ = b;
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp21_ = t;
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp17_ = ((gint) _tmp20_) == ((gint) _tmp21_);
+#line 1317 "page-view.c"
 		} else {
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp17_ = FALSE;
+#line 1321 "page-view.c"
 		}
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp22_ = _tmp17_;
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp10_ = _tmp22_;
+#line 1327 "page-view.c"
 	}
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp23_ = _tmp10_;
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp23_) {
+#line 1333 "page-view.c"
 		gboolean _tmp24_ = FALSE;
 		gdouble _tmp25_;
 		gdouble _tmp26_;
@@ -953,19 +1359,31 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 		gdouble _tmp189_;
 		gdouble _tmp190_;
 		guchar _tmp191_;
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp25_ = l;
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp26_ = r;
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if (((gint) _tmp25_) == ((gint) _tmp26_)) {
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp24_ = TRUE;
+#line 1371 "page-view.c"
 		} else {
 			gdouble _tmp27_;
 			gdouble _tmp28_;
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp27_ = t;
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp28_ = b;
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp24_ = ((gint) _tmp27_) == ((gint) _tmp28_);
+#line 1381 "page-view.c"
 		}
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp29_ = _tmp24_;
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if (_tmp29_) {
+#line 1387 "page-view.c"
 			guchar p[3] = {0};
 			Page* _tmp30_;
 			gdouble _tmp31_;
@@ -985,33 +1403,61 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 			gint _tmp42_;
 			guchar _tmp43_;
 			guchar _tmp44_;
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp30_ = page;
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp31_ = l;
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp32_ = t;
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			page_view_get_pixel (self, _tmp30_, (gint) _tmp31_, (gint) _tmp32_, p, 3);
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp33_ = output;
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp33__length1 = output_length1;
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp34_ = offset;
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp35_ = p[0];
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp33_[_tmp34_] = _tmp35_;
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp36_ = _tmp33_[_tmp34_];
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp37_ = output;
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp37__length1 = output_length1;
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp38_ = offset;
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp39_ = p[1];
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp37_[_tmp38_ + 1] = _tmp39_;
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp40_ = _tmp37_[_tmp38_ + 1];
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp41_ = output;
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp41__length1 = output_length1;
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp42_ = offset;
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp43_ = p[2];
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp41_[_tmp42_ + 2] = _tmp43_;
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp44_ = _tmp41_[_tmp42_ + 2];
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			return;
+#line 1453 "page-view.c"
 		}
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp45_ = L;
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp46_ = R;
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if (_tmp45_ > _tmp46_) {
+#line 1461 "page-view.c"
 			guchar p[3] = {0};
 			Page* _tmp47_;
 			gint _tmp48_;
@@ -1055,40 +1501,72 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 			gdouble _tmp107_;
 			gdouble _tmp108_;
 			gint _tmp109_;
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp47_ = page;
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp48_ = R;
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp49_ = T;
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			page_view_get_pixel (self, _tmp47_, _tmp48_, _tmp49_ - 1, p, 3);
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp50_ = red;
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp51_ = p[0];
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp52_ = r;
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp53_ = l;
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp54_ = T;
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp55_ = t;
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			red = _tmp50_ + ((_tmp51_ * (_tmp52_ - _tmp53_)) * (_tmp54_ - _tmp55_));
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp56_ = green;
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp57_ = p[1];
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp58_ = r;
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp59_ = l;
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp60_ = T;
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp61_ = t;
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			green = _tmp56_ + ((_tmp57_ * (_tmp58_ - _tmp59_)) * (_tmp60_ - _tmp61_));
+#line 293 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp62_ = blue;
+#line 293 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp63_ = p[2];
+#line 293 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp64_ = r;
+#line 293 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp65_ = l;
+#line 293 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp66_ = T;
+#line 293 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp67_ = t;
+#line 293 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			blue = _tmp62_ + ((_tmp63_ * (_tmp64_ - _tmp65_)) * (_tmp66_ - _tmp67_));
+#line 1555 "page-view.c"
 			{
 				gint _tmp68_;
 				gint y;
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp68_ = T;
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				y = _tmp68_;
+#line 1563 "page-view.c"
 				{
 					gboolean _tmp69_;
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp69_ = TRUE;
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					while (TRUE) {
+#line 1570 "page-view.c"
 						gboolean _tmp70_;
 						gint _tmp72_;
 						gint _tmp73_;
@@ -1107,65 +1585,123 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 						guchar _tmp86_;
 						gdouble _tmp87_;
 						gdouble _tmp88_;
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp70_ = _tmp69_;
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						if (!_tmp70_) {
+#line 1593 "page-view.c"
 							gint _tmp71_;
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp71_ = y;
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							y = _tmp71_ + 1;
+#line 1599 "page-view.c"
 						}
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp69_ = FALSE;
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp72_ = y;
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp73_ = B;
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						if (!(_tmp72_ < _tmp73_)) {
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							break;
+#line 1611 "page-view.c"
 						}
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp74_ = page;
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp75_ = R;
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp76_ = y;
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						page_view_get_pixel (self, _tmp74_, _tmp75_, _tmp76_, p, 3);
+#line 297 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp77_ = red;
+#line 297 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp78_ = p[0];
+#line 297 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp79_ = r;
+#line 297 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp80_ = l;
+#line 297 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						red = _tmp77_ + (_tmp78_ * (_tmp79_ - _tmp80_));
+#line 298 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp81_ = green;
+#line 298 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp82_ = p[1];
+#line 298 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp83_ = r;
+#line 298 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp84_ = l;
+#line 298 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						green = _tmp81_ + (_tmp82_ * (_tmp83_ - _tmp84_));
+#line 299 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp85_ = blue;
+#line 299 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp86_ = p[2];
+#line 299 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp87_ = r;
+#line 299 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp88_ = l;
+#line 299 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						blue = _tmp85_ + (_tmp86_ * (_tmp87_ - _tmp88_));
+#line 1651 "page-view.c"
 					}
 				}
 			}
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp89_ = page;
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp90_ = R;
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp91_ = B;
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			page_view_get_pixel (self, _tmp89_, _tmp90_, _tmp91_, p, 3);
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp92_ = red;
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp93_ = p[0];
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp94_ = r;
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp95_ = l;
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp96_ = b;
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp97_ = B;
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			red = _tmp92_ + ((_tmp93_ * (_tmp94_ - _tmp95_)) * (_tmp96_ - _tmp97_));
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp98_ = green;
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp99_ = p[1];
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp100_ = r;
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp101_ = l;
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp102_ = b;
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp103_ = B;
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			green = _tmp98_ + ((_tmp99_ * (_tmp100_ - _tmp101_)) * (_tmp102_ - _tmp103_));
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp104_ = blue;
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp105_ = p[2];
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp106_ = r;
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp107_ = l;
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp108_ = b;
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp109_ = B;
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			blue = _tmp104_ + ((_tmp105_ * (_tmp106_ - _tmp107_)) * (_tmp108_ - _tmp109_));
+#line 1705 "page-view.c"
 		} else {
 			guchar p[3] = {0};
 			Page* _tmp110_;
@@ -1210,40 +1746,72 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 			gdouble _tmp170_;
 			gdouble _tmp171_;
 			gint _tmp172_;
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp110_ = page;
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp111_ = L;
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp112_ = B;
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			page_view_get_pixel (self, _tmp110_, _tmp111_ - 1, _tmp112_, p, 3);
+#line 311 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp113_ = red;
+#line 311 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp114_ = p[0];
+#line 311 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp115_ = b;
+#line 311 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp116_ = t;
+#line 311 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp117_ = L;
+#line 311 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp118_ = l;
+#line 311 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			red = _tmp113_ + ((_tmp114_ * (_tmp115_ - _tmp116_)) * (_tmp117_ - _tmp118_));
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp119_ = green;
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp120_ = p[1];
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp121_ = b;
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp122_ = t;
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp123_ = L;
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp124_ = l;
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			green = _tmp119_ + ((_tmp120_ * (_tmp121_ - _tmp122_)) * (_tmp123_ - _tmp124_));
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp125_ = blue;
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp126_ = p[2];
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp127_ = b;
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp128_ = t;
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp129_ = L;
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp130_ = l;
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			blue = _tmp125_ + ((_tmp126_ * (_tmp127_ - _tmp128_)) * (_tmp129_ - _tmp130_));
+#line 1800 "page-view.c"
 			{
 				gint _tmp131_;
 				gint x;
+#line 314 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp131_ = L;
+#line 314 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				x = _tmp131_;
+#line 1808 "page-view.c"
 				{
 					gboolean _tmp132_;
+#line 314 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp132_ = TRUE;
+#line 314 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					while (TRUE) {
+#line 1815 "page-view.c"
 						gboolean _tmp133_;
 						gint _tmp135_;
 						gint _tmp136_;
@@ -1262,127 +1830,237 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 						guchar _tmp149_;
 						gdouble _tmp150_;
 						gdouble _tmp151_;
+#line 314 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp133_ = _tmp132_;
+#line 314 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						if (!_tmp133_) {
+#line 1838 "page-view.c"
 							gint _tmp134_;
+#line 314 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp134_ = x;
+#line 314 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							x = _tmp134_ + 1;
+#line 1844 "page-view.c"
 						}
+#line 314 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp132_ = FALSE;
+#line 314 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp135_ = x;
+#line 314 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp136_ = R;
+#line 314 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						if (!(_tmp135_ < _tmp136_)) {
+#line 314 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							break;
+#line 1856 "page-view.c"
 						}
+#line 315 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp137_ = page;
+#line 315 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp138_ = x;
+#line 315 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp139_ = B;
+#line 315 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						page_view_get_pixel (self, _tmp137_, _tmp138_, _tmp139_, p, 3);
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp140_ = red;
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp141_ = p[0];
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp142_ = b;
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp143_ = t;
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						red = _tmp140_ + (_tmp141_ * (_tmp142_ - _tmp143_));
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp144_ = green;
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp145_ = p[1];
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp146_ = b;
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp147_ = t;
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						green = _tmp144_ + (_tmp145_ * (_tmp146_ - _tmp147_));
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp148_ = blue;
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp149_ = p[2];
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp150_ = b;
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp151_ = t;
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						blue = _tmp148_ + (_tmp149_ * (_tmp150_ - _tmp151_));
+#line 1896 "page-view.c"
 					}
 				}
 			}
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp152_ = page;
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp153_ = R;
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp154_ = B;
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			page_view_get_pixel (self, _tmp152_, _tmp153_, _tmp154_, p, 3);
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp155_ = red;
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp156_ = p[0];
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp157_ = b;
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp158_ = t;
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp159_ = r;
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp160_ = R;
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			red = _tmp155_ + ((_tmp156_ * (_tmp157_ - _tmp158_)) * (_tmp159_ - _tmp160_));
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp161_ = green;
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp162_ = p[1];
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp163_ = b;
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp164_ = t;
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp165_ = r;
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp166_ = R;
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			green = _tmp161_ + ((_tmp162_ * (_tmp163_ - _tmp164_)) * (_tmp165_ - _tmp166_));
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp167_ = blue;
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp168_ = p[2];
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp169_ = b;
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp170_ = t;
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp171_ = r;
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp172_ = R;
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			blue = _tmp167_ + ((_tmp168_ * (_tmp169_ - _tmp170_)) * (_tmp171_ - _tmp172_));
+#line 1950 "page-view.c"
 		}
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp173_ = r;
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp174_ = l;
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp175_ = b;
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp176_ = t;
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		scale = 1.0 / ((_tmp173_ - _tmp174_) * (_tmp175_ - _tmp176_));
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp177_ = output;
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp177__length1 = output_length1;
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp178_ = offset;
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp179_ = red;
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp180_ = scale;
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp177_[_tmp178_] = (guchar) ((_tmp179_ * _tmp180_) + 0.5);
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp181_ = _tmp177_[_tmp178_];
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp182_ = output;
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp182__length1 = output_length1;
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp183_ = offset;
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp184_ = green;
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp185_ = scale;
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp182_[_tmp183_ + 1] = (guchar) ((_tmp184_ * _tmp185_) + 0.5);
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp186_ = _tmp182_[_tmp183_ + 1];
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp187_ = output;
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp187__length1 = output_length1;
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp188_ = offset;
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp189_ = blue;
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp190_ = scale;
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp187_[_tmp188_ + 2] = (guchar) ((_tmp189_ * _tmp190_) + 0.5);
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp191_ = _tmp187_[_tmp188_ + 2];
+#line 330 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return;
+#line 2006 "page-view.c"
 	}
 	{
 		gint _tmp192_;
 		gint x;
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp192_ = L;
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		x = _tmp192_;
+#line 2015 "page-view.c"
 		{
 			gboolean _tmp193_;
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp193_ = TRUE;
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			while (TRUE) {
+#line 2022 "page-view.c"
 				gboolean _tmp194_;
 				gint _tmp196_;
 				gint _tmp197_;
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp194_ = _tmp193_;
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				if (!_tmp194_) {
+#line 2030 "page-view.c"
 					gint _tmp195_;
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp195_ = x;
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					x = _tmp195_ + 1;
+#line 2036 "page-view.c"
 				}
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp193_ = FALSE;
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp196_ = x;
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp197_ = R;
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				if (!(_tmp196_ < _tmp197_)) {
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					break;
+#line 2048 "page-view.c"
 				}
 				{
 					gint _tmp198_;
 					gint y;
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp198_ = T;
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					y = _tmp198_;
+#line 2057 "page-view.c"
 					{
 						gboolean _tmp199_;
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp199_ = TRUE;
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						while (TRUE) {
+#line 2064 "page-view.c"
 							gboolean _tmp200_;
 							gint _tmp202_;
 							gint _tmp203_;
@@ -1396,31 +2074,57 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 							guchar _tmp210_;
 							gdouble _tmp211_;
 							guchar _tmp212_;
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp200_ = _tmp199_;
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							if (!_tmp200_) {
+#line 2082 "page-view.c"
 								gint _tmp201_;
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp201_ = y;
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								y = _tmp201_ + 1;
+#line 2088 "page-view.c"
 							}
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp199_ = FALSE;
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp202_ = y;
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp203_ = B;
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							if (!(_tmp202_ < _tmp203_)) {
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								break;
+#line 2100 "page-view.c"
 							}
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp204_ = page;
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp205_ = x;
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp206_ = y;
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							page_view_get_pixel (self, _tmp204_, _tmp205_, _tmp206_, p, 3);
+#line 340 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp207_ = red;
+#line 340 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp208_ = p[0];
+#line 340 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							red = _tmp207_ + _tmp208_;
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp209_ = green;
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp210_ = p[1];
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							green = _tmp209_ + _tmp210_;
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp211_ = blue;
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp212_ = p[2];
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							blue = _tmp211_ + _tmp212_;
+#line 2128 "page-view.c"
 						}
 					}
 				}
@@ -1430,12 +2134,18 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 	{
 		gint _tmp213_;
 		gint x;
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp213_ = L;
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		x = _tmp213_;
+#line 2142 "page-view.c"
 		{
 			gboolean _tmp214_;
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp214_ = TRUE;
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			while (TRUE) {
+#line 2149 "page-view.c"
 				gboolean _tmp215_;
 				gint _tmp217_;
 				gint _tmp218_;
@@ -1443,21 +2153,37 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 				gint _tmp220_;
 				gdouble _tmp236_;
 				gint _tmp237_;
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp215_ = _tmp214_;
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				if (!_tmp215_) {
+#line 2161 "page-view.c"
 					gint _tmp216_;
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp216_ = x;
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					x = _tmp216_ + 1;
+#line 2167 "page-view.c"
 				}
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp214_ = FALSE;
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp217_ = x;
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp218_ = R;
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				if (!(_tmp217_ < _tmp218_)) {
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					break;
+#line 2179 "page-view.c"
 				}
+#line 349 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp219_ = t;
+#line 349 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp220_ = T;
+#line 349 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				if (_tmp219_ != ((gdouble) _tmp220_)) {
+#line 2187 "page-view.c"
 					guchar p[3] = {0};
 					Page* _tmp221_;
 					gint _tmp222_;
@@ -1474,29 +2200,53 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 					guchar _tmp233_;
 					gint _tmp234_;
 					gdouble _tmp235_;
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp221_ = page;
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp222_ = x;
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp223_ = T;
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					page_view_get_pixel (self, _tmp221_, _tmp222_, _tmp223_ - 1, p, 3);
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp224_ = red;
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp225_ = p[0];
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp226_ = T;
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp227_ = t;
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					red = _tmp224_ + (_tmp225_ * (_tmp226_ - _tmp227_));
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp228_ = green;
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp229_ = p[1];
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp230_ = T;
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp231_ = t;
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					green = _tmp228_ + (_tmp229_ * (_tmp230_ - _tmp231_));
+#line 355 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp232_ = blue;
+#line 355 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp233_ = p[2];
+#line 355 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp234_ = T;
+#line 355 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp235_ = t;
+#line 355 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					blue = _tmp232_ + (_tmp233_ * (_tmp234_ - _tmp235_));
+#line 2242 "page-view.c"
 				}
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp236_ = b;
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp237_ = B;
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				if (_tmp236_ != ((gdouble) _tmp237_)) {
+#line 2250 "page-view.c"
 					guchar p[3] = {0};
 					Page* _tmp238_;
 					gint _tmp239_;
@@ -1513,25 +2263,45 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 					guchar _tmp250_;
 					gdouble _tmp251_;
 					gint _tmp252_;
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp238_ = page;
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp239_ = x;
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp240_ = B;
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					page_view_get_pixel (self, _tmp238_, _tmp239_, _tmp240_, p, 3);
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp241_ = red;
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp242_ = p[0];
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp243_ = b;
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp244_ = B;
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					red = _tmp241_ + (_tmp242_ * (_tmp243_ - _tmp244_));
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp245_ = green;
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp246_ = p[1];
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp247_ = b;
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp248_ = B;
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					green = _tmp245_ + (_tmp246_ * (_tmp247_ - _tmp248_));
+#line 364 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp249_ = blue;
+#line 364 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp250_ = p[2];
+#line 364 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp251_ = b;
+#line 364 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp252_ = B;
+#line 364 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					blue = _tmp249_ + (_tmp250_ * (_tmp251_ - _tmp252_));
+#line 2305 "page-view.c"
 				}
 			}
 		}
@@ -1539,12 +2309,18 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 	{
 		gint _tmp253_;
 		gint y;
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp253_ = T;
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		y = _tmp253_;
+#line 2317 "page-view.c"
 		{
 			gboolean _tmp254_;
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp254_ = TRUE;
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			while (TRUE) {
+#line 2324 "page-view.c"
 				gboolean _tmp255_;
 				gint _tmp257_;
 				gint _tmp258_;
@@ -1552,21 +2328,37 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 				gint _tmp260_;
 				gdouble _tmp276_;
 				gint _tmp277_;
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp255_ = _tmp254_;
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				if (!_tmp255_) {
+#line 2336 "page-view.c"
 					gint _tmp256_;
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp256_ = y;
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					y = _tmp256_ + 1;
+#line 2342 "page-view.c"
 				}
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp254_ = FALSE;
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp257_ = y;
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp258_ = B;
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				if (!(_tmp257_ < _tmp258_)) {
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					break;
+#line 2354 "page-view.c"
 				}
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp259_ = l;
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp260_ = L;
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				if (_tmp259_ != ((gdouble) _tmp260_)) {
+#line 2362 "page-view.c"
 					guchar p[3] = {0};
 					Page* _tmp261_;
 					gint _tmp262_;
@@ -1583,29 +2375,53 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 					guchar _tmp273_;
 					gint _tmp274_;
 					gdouble _tmp275_;
+#line 374 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp261_ = page;
+#line 374 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp262_ = L;
+#line 374 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp263_ = y;
+#line 374 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					page_view_get_pixel (self, _tmp261_, _tmp262_ - 1, _tmp263_, p, 3);
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp264_ = red;
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp265_ = p[0];
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp266_ = L;
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp267_ = l;
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					red = _tmp264_ + (_tmp265_ * (_tmp266_ - _tmp267_));
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp268_ = green;
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp269_ = p[1];
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp270_ = L;
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp271_ = l;
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					green = _tmp268_ + (_tmp269_ * (_tmp270_ - _tmp271_));
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp272_ = blue;
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp273_ = p[2];
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp274_ = L;
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp275_ = l;
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					blue = _tmp272_ + (_tmp273_ * (_tmp274_ - _tmp275_));
+#line 2417 "page-view.c"
 				}
+#line 380 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp276_ = r;
+#line 380 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp277_ = R;
+#line 380 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				if (_tmp276_ != ((gdouble) _tmp277_)) {
+#line 2425 "page-view.c"
 					guchar p[3] = {0};
 					Page* _tmp278_;
 					gint _tmp279_;
@@ -1622,42 +2438,75 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 					guchar _tmp290_;
 					gdouble _tmp291_;
 					gint _tmp292_;
+#line 383 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp278_ = page;
+#line 383 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp279_ = R;
+#line 383 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp280_ = y;
+#line 383 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					page_view_get_pixel (self, _tmp278_, _tmp279_, _tmp280_, p, 3);
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp281_ = red;
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp282_ = p[0];
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp283_ = r;
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp284_ = R;
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					red = _tmp281_ + (_tmp282_ * (_tmp283_ - _tmp284_));
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp285_ = green;
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp286_ = p[1];
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp287_ = r;
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp288_ = R;
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					green = _tmp285_ + (_tmp286_ * (_tmp287_ - _tmp288_));
+#line 386 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp289_ = blue;
+#line 386 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp290_ = p[2];
+#line 386 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp291_ = r;
+#line 386 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp292_ = R;
+#line 386 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					blue = _tmp289_ + (_tmp290_ * (_tmp291_ - _tmp292_));
+#line 2480 "page-view.c"
 				}
 			}
 		}
 	}
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp294_ = l;
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp295_ = L;
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp294_ != ((gdouble) _tmp295_)) {
+#line 2491 "page-view.c"
 		gdouble _tmp296_;
 		gint _tmp297_;
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp296_ = t;
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp297_ = T;
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp293_ = _tmp296_ != ((gdouble) _tmp297_);
+#line 2500 "page-view.c"
 	} else {
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp293_ = FALSE;
+#line 2504 "page-view.c"
 	}
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp298_ = _tmp293_;
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp298_) {
+#line 2510 "page-view.c"
 		guchar p[3] = {0};
 		Page* _tmp299_;
 		gint _tmp300_;
@@ -1680,45 +2529,84 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 		gdouble _tmp317_;
 		gint _tmp318_;
 		gdouble _tmp319_;
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp299_ = page;
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp300_ = L;
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp301_ = T;
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		page_view_get_pixel (self, _tmp299_, _tmp300_ - 1, _tmp301_ - 1, p, 3);
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp302_ = red;
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp303_ = p[0];
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp304_ = L;
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp305_ = l;
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp306_ = T;
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp307_ = t;
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		red = _tmp302_ + ((_tmp303_ * (_tmp304_ - _tmp305_)) * (_tmp306_ - _tmp307_));
+#line 396 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp308_ = green;
+#line 396 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp309_ = p[1];
+#line 396 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp310_ = L;
+#line 396 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp311_ = l;
+#line 396 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp312_ = T;
+#line 396 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp313_ = t;
+#line 396 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		green = _tmp308_ + ((_tmp309_ * (_tmp310_ - _tmp311_)) * (_tmp312_ - _tmp313_));
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp314_ = blue;
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp315_ = p[2];
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp316_ = L;
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp317_ = l;
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp318_ = T;
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp319_ = t;
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		blue = _tmp314_ + ((_tmp315_ * (_tmp316_ - _tmp317_)) * (_tmp318_ - _tmp319_));
+#line 2583 "page-view.c"
 	}
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp321_ = r;
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp322_ = R;
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp321_ != ((gdouble) _tmp322_)) {
+#line 2591 "page-view.c"
 		gdouble _tmp323_;
 		gint _tmp324_;
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp323_ = t;
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp324_ = T;
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp320_ = _tmp323_ != ((gdouble) _tmp324_);
+#line 2600 "page-view.c"
 	} else {
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp320_ = FALSE;
+#line 2604 "page-view.c"
 	}
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp325_ = _tmp320_;
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp325_) {
+#line 2610 "page-view.c"
 		guchar p[3] = {0};
 		Page* _tmp326_;
 		gint _tmp327_;
@@ -1741,45 +2629,84 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 		gint _tmp344_;
 		gint _tmp345_;
 		gdouble _tmp346_;
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp326_ = page;
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp327_ = R;
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp328_ = T;
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		page_view_get_pixel (self, _tmp326_, _tmp327_, _tmp328_ - 1, p, 3);
+#line 403 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp329_ = red;
+#line 403 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp330_ = p[0];
+#line 403 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp331_ = r;
+#line 403 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp332_ = R;
+#line 403 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp333_ = T;
+#line 403 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp334_ = t;
+#line 403 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		red = _tmp329_ + ((_tmp330_ * (_tmp331_ - _tmp332_)) * (_tmp333_ - _tmp334_));
+#line 404 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp335_ = green;
+#line 404 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp336_ = p[1];
+#line 404 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp337_ = r;
+#line 404 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp338_ = R;
+#line 404 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp339_ = T;
+#line 404 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp340_ = t;
+#line 404 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		green = _tmp335_ + ((_tmp336_ * (_tmp337_ - _tmp338_)) * (_tmp339_ - _tmp340_));
+#line 405 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp341_ = blue;
+#line 405 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp342_ = p[2];
+#line 405 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp343_ = r;
+#line 405 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp344_ = R;
+#line 405 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp345_ = T;
+#line 405 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp346_ = t;
+#line 405 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		blue = _tmp341_ + ((_tmp342_ * (_tmp343_ - _tmp344_)) * (_tmp345_ - _tmp346_));
+#line 2683 "page-view.c"
 	}
+#line 407 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp348_ = r;
+#line 407 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp349_ = R;
+#line 407 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp348_ != ((gdouble) _tmp349_)) {
+#line 2691 "page-view.c"
 		gdouble _tmp350_;
 		gint _tmp351_;
+#line 407 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp350_ = b;
+#line 407 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp351_ = B;
+#line 407 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp347_ = _tmp350_ != ((gdouble) _tmp351_);
+#line 2700 "page-view.c"
 	} else {
+#line 407 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp347_ = FALSE;
+#line 2704 "page-view.c"
 	}
+#line 407 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp352_ = _tmp347_;
+#line 407 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp352_) {
+#line 2710 "page-view.c"
 		guchar p[3] = {0};
 		Page* _tmp353_;
 		gint _tmp354_;
@@ -1802,45 +2729,84 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 		gint _tmp371_;
 		gdouble _tmp372_;
 		gint _tmp373_;
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp353_ = page;
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp354_ = R;
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp355_ = B;
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		page_view_get_pixel (self, _tmp353_, _tmp354_, _tmp355_, p, 3);
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp356_ = red;
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp357_ = p[0];
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp358_ = r;
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp359_ = R;
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp360_ = b;
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp361_ = B;
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		red = _tmp356_ + ((_tmp357_ * (_tmp358_ - _tmp359_)) * (_tmp360_ - _tmp361_));
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp362_ = green;
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp363_ = p[1];
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp364_ = r;
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp365_ = R;
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp366_ = b;
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp367_ = B;
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		green = _tmp362_ + ((_tmp363_ * (_tmp364_ - _tmp365_)) * (_tmp366_ - _tmp367_));
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp368_ = blue;
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp369_ = p[2];
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp370_ = r;
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp371_ = R;
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp372_ = b;
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp373_ = B;
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		blue = _tmp368_ + ((_tmp369_ * (_tmp370_ - _tmp371_)) * (_tmp372_ - _tmp373_));
+#line 2783 "page-view.c"
 	}
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp375_ = l;
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp376_ = L;
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp375_ != ((gdouble) _tmp376_)) {
+#line 2791 "page-view.c"
 		gdouble _tmp377_;
 		gint _tmp378_;
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp377_ = b;
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp378_ = B;
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp374_ = _tmp377_ != ((gdouble) _tmp378_);
+#line 2800 "page-view.c"
 	} else {
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp374_ = FALSE;
+#line 2804 "page-view.c"
 	}
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp379_ = _tmp374_;
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp379_) {
+#line 2810 "page-view.c"
 		guchar p[3] = {0};
 		Page* _tmp380_;
 		gint _tmp381_;
@@ -1863,58 +2829,111 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 		gdouble _tmp398_;
 		gdouble _tmp399_;
 		gint _tmp400_;
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp380_ = page;
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp381_ = L;
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp382_ = B;
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		page_view_get_pixel (self, _tmp380_, _tmp381_ - 1, _tmp382_, p, 3);
+#line 419 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp383_ = red;
+#line 419 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp384_ = p[0];
+#line 419 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp385_ = L;
+#line 419 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp386_ = l;
+#line 419 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp387_ = b;
+#line 419 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp388_ = B;
+#line 419 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		red = _tmp383_ + ((_tmp384_ * (_tmp385_ - _tmp386_)) * (_tmp387_ - _tmp388_));
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp389_ = green;
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp390_ = p[1];
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp391_ = L;
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp392_ = l;
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp393_ = b;
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp394_ = B;
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		green = _tmp389_ + ((_tmp390_ * (_tmp391_ - _tmp392_)) * (_tmp393_ - _tmp394_));
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp395_ = blue;
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp396_ = p[2];
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp397_ = L;
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp398_ = l;
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp399_ = b;
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp400_ = B;
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		blue = _tmp395_ + ((_tmp396_ * (_tmp397_ - _tmp398_)) * (_tmp399_ - _tmp400_));
+#line 2883 "page-view.c"
 	}
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp401_ = r;
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp402_ = l;
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp403_ = b;
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp404_ = t;
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	scale = 1.0 / ((_tmp401_ - _tmp402_) * (_tmp403_ - _tmp404_));
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp405_ = output;
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp405__length1 = output_length1;
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp406_ = offset;
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp407_ = red;
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp408_ = scale;
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp405_[_tmp406_] = (guchar) ((_tmp407_ * _tmp408_) + 0.5);
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp409_ = _tmp405_[_tmp406_];
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp410_ = output;
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp410__length1 = output_length1;
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp411_ = offset;
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp412_ = green;
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp413_ = scale;
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp410_[_tmp411_ + 1] = (guchar) ((_tmp412_ * _tmp413_) + 0.5);
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp414_ = _tmp410_[_tmp411_ + 1];
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp415_ = output;
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp415__length1 = output_length1;
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp416_ = offset;
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp417_ = blue;
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp418_ = scale;
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp415_[_tmp416_ + 2] = (guchar) ((_tmp417_ * _tmp418_) + 0.5);
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp419_ = _tmp415_[_tmp416_ + 2];
+#line 2937 "page-view.c"
 }
 
 
@@ -1958,61 +2977,106 @@ static void page_view_update_preview (PageView* self, Page* page, GdkPixbuf** ou
 	gint output_n_channels;
 	Page* _tmp75_;
 	gboolean _tmp76_ = FALSE;
+#line 431 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
+#line 431 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (page != NULL);
+#line 434 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = page;
+#line 434 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = page_get_width (_tmp0_);
+#line 434 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	input_width = _tmp1_;
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = page;
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp3_ = page_get_height (_tmp2_);
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	input_height = _tmp3_;
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp6_ = *output_image;
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp6_ == NULL) {
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp5_ = TRUE;
+#line 3003 "page-view.c"
 	} else {
 		GdkPixbuf* _tmp7_;
 		gint _tmp8_ = 0;
 		gint _tmp9_;
+#line 440 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp7_ = *output_image;
+#line 440 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp8_ = gdk_pixbuf_get_width (_tmp7_);
+#line 440 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp9_ = output_width;
+#line 440 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp5_ = _tmp8_ != _tmp9_;
+#line 3016 "page-view.c"
 	}
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp10_ = _tmp5_;
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp10_) {
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp4_ = TRUE;
+#line 3024 "page-view.c"
 	} else {
 		GdkPixbuf* _tmp11_;
 		gint _tmp12_ = 0;
 		gint _tmp13_;
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp11_ = *output_image;
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp12_ = gdk_pixbuf_get_height (_tmp11_);
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp13_ = output_height;
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp4_ = _tmp12_ != _tmp13_;
+#line 3037 "page-view.c"
 	}
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp14_ = _tmp4_;
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp14_) {
+#line 3043 "page-view.c"
 		gint _tmp15_;
 		gint _tmp16_;
 		GdkPixbuf* _tmp17_;
 		gint _tmp18_;
 		gint _tmp19_;
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp15_ = output_width;
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp16_ = output_height;
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp17_ = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, _tmp15_, _tmp16_);
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_object_unref0 (*output_image);
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		*output_image = _tmp17_;
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		L = 0;
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp18_ = output_width;
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		R = _tmp18_ - 1;
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		T = 0;
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp19_ = output_height;
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		B = _tmp19_ - 1;
+#line 3071 "page-view.c"
 	} else {
 		ScanDirection _tmp20_;
+#line 458 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp20_ = scan_direction;
+#line 458 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		switch (_tmp20_) {
+#line 458 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			case SCAN_DIRECTION_TOP_TO_BOTTOM:
+#line 3080 "page-view.c"
 			{
 				gint _tmp21_;
 				gint _tmp22_;
@@ -2021,20 +3085,35 @@ static void page_view_update_preview (PageView* self, Page* page, GdkPixbuf** ou
 				gint _tmp25_;
 				gint _tmp26_;
 				gint _tmp27_;
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				L = 0;
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp21_ = output_width;
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				R = _tmp21_ - 1;
+#line 463 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp22_ = old_scan_line;
+#line 463 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp23_ = output_height;
+#line 463 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp24_ = input_height;
+#line 463 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				T = (gint) ((((gdouble) _tmp22_) * _tmp23_) / _tmp24_);
+#line 464 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp25_ = scan_line;
+#line 464 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp26_ = output_height;
+#line 464 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp27_ = input_height;
+#line 464 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				B = (gint) (((((gdouble) _tmp25_) * _tmp26_) / _tmp27_) + 0.5);
+#line 465 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				break;
+#line 3113 "page-view.c"
 			}
+#line 458 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			case SCAN_DIRECTION_LEFT_TO_RIGHT:
+#line 3117 "page-view.c"
 			{
 				gint _tmp28_;
 				gint _tmp29_;
@@ -2043,20 +3122,35 @@ static void page_view_update_preview (PageView* self, Page* page, GdkPixbuf** ou
 				gint _tmp32_;
 				gint _tmp33_;
 				gint _tmp34_;
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp28_ = old_scan_line;
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp29_ = output_width;
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp30_ = input_width;
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				L = (gint) ((((gdouble) _tmp28_) * _tmp29_) / _tmp30_);
+#line 468 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp31_ = scan_line;
+#line 468 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp32_ = output_width;
+#line 468 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp33_ = input_width;
+#line 468 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				R = (gint) (((((gdouble) _tmp31_) * _tmp32_) / _tmp33_) + 0.5);
+#line 469 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				T = 0;
+#line 470 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp34_ = output_height;
+#line 470 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				B = _tmp34_ - 1;
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				break;
+#line 3150 "page-view.c"
 			}
+#line 458 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			case SCAN_DIRECTION_BOTTOM_TO_TOP:
+#line 3154 "page-view.c"
 			{
 				gint _tmp35_;
 				gint _tmp36_;
@@ -2067,22 +3161,39 @@ static void page_view_update_preview (PageView* self, Page* page, GdkPixbuf** ou
 				gint _tmp41_;
 				gint _tmp42_;
 				gint _tmp43_;
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				L = 0;
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp35_ = output_width;
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				R = _tmp35_ - 1;
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp36_ = input_height;
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp37_ = scan_line;
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp38_ = output_height;
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp39_ = input_height;
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				T = (gint) ((((gdouble) (_tmp36_ - _tmp37_)) * _tmp38_) / _tmp39_);
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp40_ = input_height;
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp41_ = old_scan_line;
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp42_ = output_height;
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp43_ = input_height;
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				B = (gint) (((((gdouble) (_tmp40_ - _tmp41_)) * _tmp42_) / _tmp43_) + 0.5);
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				break;
+#line 3193 "page-view.c"
 			}
+#line 458 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			case SCAN_DIRECTION_RIGHT_TO_LEFT:
+#line 3197 "page-view.c"
 			{
 				gint _tmp44_;
 				gint _tmp45_;
@@ -2093,110 +3204,199 @@ static void page_view_update_preview (PageView* self, Page* page, GdkPixbuf** ou
 				gint _tmp50_;
 				gint _tmp51_;
 				gint _tmp52_;
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp44_ = input_width;
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp45_ = scan_line;
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp46_ = output_width;
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp47_ = input_width;
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				L = (gint) ((((gdouble) (_tmp44_ - _tmp45_)) * _tmp46_) / _tmp47_);
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp48_ = input_width;
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp49_ = old_scan_line;
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp50_ = output_width;
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp51_ = input_width;
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				R = (gint) (((((gdouble) (_tmp48_ - _tmp49_)) * _tmp50_) / _tmp51_) + 0.5);
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				T = 0;
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp52_ = output_height;
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				B = _tmp52_ - 1;
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				break;
+#line 3236 "page-view.c"
 			}
 			default:
 			{
 				gint _tmp53_;
 				gint _tmp54_;
 				gint _tmp55_;
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				T = 0;
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp53_ = T;
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				B = _tmp53_;
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp54_ = B;
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				R = _tmp54_;
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp55_ = R;
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				L = _tmp55_;
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				break;
+#line 3259 "page-view.c"
 			}
 		}
 	}
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp56_ = R;
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp57_ = output_width;
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp56_ >= _tmp57_) {
+#line 3269 "page-view.c"
 		gint _tmp58_;
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp58_ = output_width;
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		R = _tmp58_ - 1;
+#line 3275 "page-view.c"
 	}
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp59_ = B;
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp60_ = output_height;
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp59_ >= _tmp60_) {
+#line 3283 "page-view.c"
 		gint _tmp61_;
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp61_ = output_height;
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		B = _tmp61_ - 1;
+#line 3289 "page-view.c"
 	}
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp62_ = L;
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (_tmp62_ >= 0);
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp63_ = R;
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp64_ = output_width;
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (_tmp63_ < _tmp64_);
+#line 498 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp65_ = T;
+#line 498 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (_tmp65_ >= 0);
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp66_ = B;
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp67_ = output_height;
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (_tmp66_ < _tmp67_);
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp68_ = *output_image;
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (_tmp68_ != NULL);
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp69_ = *output_image;
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp70_ = gdk_pixbuf_get_pixels (_tmp69_);
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	output = _tmp70_;
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	output_length1 = -1;
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_output_size_ = output_length1;
+#line 503 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp71_ = *output_image;
+#line 503 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp72_ = gdk_pixbuf_get_rowstride (_tmp71_);
+#line 503 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	output_rowstride = _tmp72_;
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp73_ = *output_image;
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp74_ = gdk_pixbuf_get_n_channels (_tmp73_);
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	output_n_channels = _tmp74_;
+#line 506 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp75_ = page;
+#line 506 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp76_ = page_has_data (_tmp75_);
+#line 506 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (!_tmp76_) {
+#line 3343 "page-view.c"
 		{
 			gint _tmp77_;
 			gint x;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp77_ = L;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			x = _tmp77_;
+#line 3351 "page-view.c"
 			{
 				gboolean _tmp78_;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp78_ = TRUE;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				while (TRUE) {
+#line 3358 "page-view.c"
 					gboolean _tmp79_;
 					gint _tmp81_;
 					gint _tmp82_;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp79_ = _tmp78_;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					if (!_tmp79_) {
+#line 3366 "page-view.c"
 						gint _tmp80_;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp80_ = x;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						x = _tmp80_ + 1;
+#line 3372 "page-view.c"
 					}
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp78_ = FALSE;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp81_ = x;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp82_ = R;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					if (!(_tmp81_ <= _tmp82_)) {
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						break;
+#line 3384 "page-view.c"
 					}
 					{
 						gint _tmp83_;
 						gint y;
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp83_ = T;
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						y = _tmp83_;
+#line 3393 "page-view.c"
 						{
 							gboolean _tmp84_;
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp84_ = TRUE;
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							while (TRUE) {
+#line 3400 "page-view.c"
 								gboolean _tmp85_;
 								gint _tmp87_;
 								gint _tmp88_;
@@ -2217,55 +3417,96 @@ static void page_view_update_preview (PageView* self, Page* page, GdkPixbuf** ou
 								guchar _tmp99_;
 								guchar _tmp100_;
 								guchar _tmp101_;
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp85_ = _tmp84_;
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								if (!_tmp85_) {
+#line 3425 "page-view.c"
 									gint _tmp86_;
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 									_tmp86_ = y;
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 									y = _tmp86_ + 1;
+#line 3431 "page-view.c"
 								}
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp84_ = FALSE;
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp87_ = y;
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp88_ = B;
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								if (!(_tmp87_ <= _tmp88_)) {
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 									break;
+#line 3443 "page-view.c"
 								}
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp89_ = output_rowstride;
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp90_ = y;
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp91_ = x;
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp92_ = output_n_channels;
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								o = (_tmp89_ * _tmp90_) + (_tmp91_ * _tmp92_);
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp93_ = output;
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp93__length1 = output_length1;
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp94_ = o;
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp95_ = output;
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp95__length1 = output_length1;
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp96_ = o;
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp97_ = output;
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp97__length1 = output_length1;
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp98_ = o;
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp97_[_tmp98_ + 2] = (guchar) 0xFF;
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp99_ = _tmp97_[_tmp98_ + 2];
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp95_[_tmp96_ + 1] = _tmp99_;
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp100_ = _tmp95_[_tmp96_ + 1];
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp93_[_tmp94_] = _tmp100_;
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp101_ = _tmp93_[_tmp94_];
+#line 3485 "page-view.c"
 							}
 						}
 					}
 				}
 			}
 		}
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return;
+#line 3494 "page-view.c"
 	}
 	{
 		gint _tmp102_;
 		gint x;
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp102_ = L;
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		x = _tmp102_;
+#line 3503 "page-view.c"
 		{
 			gboolean _tmp103_;
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp103_ = TRUE;
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			while (TRUE) {
+#line 3510 "page-view.c"
 				gboolean _tmp104_;
 				gint _tmp106_;
 				gint _tmp107_;
@@ -2277,35 +3518,62 @@ static void page_view_update_preview (PageView* self, Page* page, GdkPixbuf** ou
 				gint _tmp112_;
 				gint _tmp113_;
 				gdouble r;
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp104_ = _tmp103_;
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				if (!_tmp104_) {
+#line 3526 "page-view.c"
 					gint _tmp105_;
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp105_ = x;
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					x = _tmp105_ + 1;
+#line 3532 "page-view.c"
 				}
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp103_ = FALSE;
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp106_ = x;
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp107_ = R;
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				if (!(_tmp106_ <= _tmp107_)) {
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					break;
+#line 3544 "page-view.c"
 				}
+#line 520 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp108_ = x;
+#line 520 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp109_ = input_width;
+#line 520 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp110_ = output_width;
+#line 520 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				l = (((gdouble) _tmp108_) * _tmp109_) / _tmp110_;
+#line 521 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp111_ = x;
+#line 521 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp112_ = input_width;
+#line 521 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp113_ = output_width;
+#line 521 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				r = (((gdouble) (_tmp111_ + 1)) * _tmp112_) / _tmp113_;
+#line 3562 "page-view.c"
 				{
 					gint _tmp114_;
 					gint y;
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp114_ = T;
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					y = _tmp114_;
+#line 3570 "page-view.c"
 					{
 						gboolean _tmp115_;
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp115_ = TRUE;
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						while (TRUE) {
+#line 3577 "page-view.c"
 							gboolean _tmp116_;
 							gint _tmp118_;
 							gint _tmp119_;
@@ -2328,38 +3596,71 @@ static void page_view_update_preview (PageView* self, Page* page, GdkPixbuf** ou
 							gint _tmp133_;
 							gint _tmp134_;
 							gint _tmp135_;
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp116_ = _tmp115_;
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							if (!_tmp116_) {
+#line 3604 "page-view.c"
 								gint _tmp117_;
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp117_ = y;
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								y = _tmp117_ + 1;
+#line 3610 "page-view.c"
 							}
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp115_ = FALSE;
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp118_ = y;
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp119_ = B;
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							if (!(_tmp118_ <= _tmp119_)) {
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								break;
+#line 3622 "page-view.c"
 							}
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp120_ = y;
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp121_ = input_height;
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp122_ = output_height;
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							t = (((gdouble) _tmp120_) * _tmp121_) / _tmp122_;
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp123_ = y;
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp124_ = input_height;
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp125_ = output_height;
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							b = (((gdouble) (_tmp123_ + 1)) * _tmp124_) / _tmp125_;
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp126_ = page;
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp127_ = l;
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp128_ = r;
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp129_ = t;
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp130_ = b;
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp131_ = output;
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp131__length1 = output_length1;
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp132_ = output_rowstride;
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp133_ = y;
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp134_ = x;
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp135_ = output_n_channels;
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							page_view_set_pixel (self, _tmp126_, _tmp127_, _tmp128_, _tmp129_, _tmp130_, _tmp131_, _tmp131__length1, (_tmp132_ * _tmp133_) + (_tmp134_ * _tmp135_));
+#line 3664 "page-view.c"
 						}
 					}
 				}
@@ -2373,11 +3674,17 @@ static gint page_view_get_preview_width (PageView* self) {
 	gint result = 0;
 	gint _tmp0_;
 	gint _tmp1_;
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, 0);
+#line 537 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = self->priv->width;
+#line 537 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = self->priv->border_width;
+#line 537 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	result = _tmp0_ - (_tmp1_ * 2);
+#line 537 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
+#line 3688 "page-view.c"
 }
 
 
@@ -2385,11 +3692,17 @@ static gint page_view_get_preview_height (PageView* self) {
 	gint result = 0;
 	gint _tmp0_;
 	gint _tmp1_;
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, 0);
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = self->priv->height;
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = self->priv->border_width;
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	result = _tmp0_ - (_tmp1_ * 2);
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
+#line 3706 "page-view.c"
 }
 
 
@@ -2417,47 +3730,89 @@ static void page_view_update_page_view (PageView* self) {
 	gint _tmp18_;
 	gint _tmp19_;
 	gint _tmp20_;
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
+#line 547 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = self->priv->update_image;
+#line 547 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (!_tmp0_) {
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return;
+#line 3742 "page-view.c"
 	}
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = self->priv->scan_line;
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	old_scan_line = _tmp1_;
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = self->priv->page;
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp3_ = page_get_scan_line (_tmp2_);
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	scan_line = _tmp3_;
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp4_ = self->priv->scan_direction;
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp5_ = self->priv->page;
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp6_ = page_get_scan_direction (_tmp5_);
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	left_steps = _tmp4_ - _tmp6_;
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp8_ = left_steps;
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp8_ != 0) {
+#line 3766 "page-view.c"
 		GdkPixbuf* _tmp9_;
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp9_ = self->priv->image;
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp7_ = _tmp9_ != NULL;
+#line 3772 "page-view.c"
 	} else {
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp7_ = FALSE;
+#line 3776 "page-view.c"
 	}
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp10_ = _tmp7_;
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp10_) {
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_object_unref0 (self->priv->image);
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		self->priv->image = NULL;
+#line 3786 "page-view.c"
 	}
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp11_ = self->priv->page;
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp12_ = page_get_scan_direction (_tmp11_);
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->scan_direction = _tmp12_;
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp13_ = self->priv->page;
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp14_ = page_view_get_preview_width (self);
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp15_ = page_view_get_preview_height (self);
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp16_ = self->priv->page;
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp17_ = page_get_scan_direction (_tmp16_);
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp18_ = old_scan_line;
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp19_ = scan_line;
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	page_view_update_preview (self, _tmp13_, &self->priv->image, _tmp14_, _tmp15_, _tmp17_, _tmp18_, _tmp19_);
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->update_image = FALSE;
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp20_ = scan_line;
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->scan_line = _tmp20_;
+#line 3816 "page-view.c"
 }
 
 
@@ -2467,13 +3822,21 @@ static gint page_view_page_to_screen_x (PageView* self, gint x) {
 	gint _tmp1_ = 0;
 	Page* _tmp2_;
 	gint _tmp3_ = 0;
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, 0);
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = x;
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = page_view_get_preview_width (self);
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = self->priv->page;
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp3_ = page_get_width (_tmp2_);
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	result = (gint) (((((gdouble) _tmp0_) * _tmp1_) / _tmp3_) + 0.5);
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
+#line 3840 "page-view.c"
 }
 
 
@@ -2483,13 +3846,21 @@ static gint page_view_page_to_screen_y (PageView* self, gint y) {
 	gint _tmp1_ = 0;
 	Page* _tmp2_;
 	gint _tmp3_ = 0;
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, 0);
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = y;
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = page_view_get_preview_height (self);
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = self->priv->page;
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp3_ = page_get_height (_tmp2_);
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	result = (gint) (((((gdouble) _tmp0_) * _tmp1_) / _tmp3_) + 0.5);
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
+#line 3864 "page-view.c"
 }
 
 
@@ -2499,13 +3870,21 @@ static gint page_view_screen_to_page_x (PageView* self, gint x) {
 	Page* _tmp1_;
 	gint _tmp2_ = 0;
 	gint _tmp3_ = 0;
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, 0);
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = x;
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = self->priv->page;
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = page_get_width (_tmp1_);
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp3_ = page_view_get_preview_width (self);
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	result = (gint) (((((gdouble) _tmp0_) * _tmp2_) / _tmp3_) + 0.5);
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
+#line 3888 "page-view.c"
 }
 
 
@@ -2515,13 +3894,21 @@ static gint page_view_screen_to_page_y (PageView* self, gint y) {
 	Page* _tmp1_;
 	gint _tmp2_ = 0;
 	gint _tmp3_ = 0;
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, 0);
+#line 586 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = y;
+#line 586 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = self->priv->page;
+#line 586 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = page_get_height (_tmp1_);
+#line 586 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp3_ = page_view_get_preview_height (self);
+#line 586 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	result = (gint) (((((gdouble) _tmp0_) * _tmp2_) / _tmp3_) + 0.5);
+#line 586 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
+#line 3912 "page-view.c"
 }
 
 
@@ -2600,201 +3987,386 @@ static CropLocation page_view_get_crop_location (PageView* self, gint x, gint y)
 	gint _tmp75_;
 	gint _tmp76_;
 	gint _tmp77_;
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, 0);
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = self->priv->page;
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = page_has_crop (_tmp0_);
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (!_tmp1_) {
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = 0;
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
+#line 4003 "page-view.c"
 	}
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = self->priv->page;
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	page_get_crop (_tmp2_, &_tmp3_, &_tmp4_, &_tmp5_, &_tmp6_);
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	cx = _tmp3_;
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	cy = _tmp4_;
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	cw = _tmp5_;
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	ch = _tmp6_;
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp7_ = cx;
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp8_ = page_view_page_to_screen_x (self, _tmp7_);
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	dx = _tmp8_;
+#line 597 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp9_ = cy;
+#line 597 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp10_ = page_view_page_to_screen_y (self, _tmp9_);
+#line 597 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	dy = _tmp10_;
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp11_ = cw;
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp12_ = page_view_page_to_screen_x (self, _tmp11_);
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	dw = _tmp12_;
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp13_ = ch;
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp14_ = page_view_page_to_screen_y (self, _tmp13_);
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	dh = _tmp14_;
+#line 600 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp15_ = x;
+#line 600 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp16_ = dx;
+#line 600 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	ix = _tmp15_ - _tmp16_;
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp17_ = y;
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp18_ = dy;
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	iy = _tmp17_ - _tmp18_;
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp22_ = ix;
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp22_ < 0) {
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp21_ = TRUE;
+#line 4059 "page-view.c"
 	} else {
 		gint _tmp23_;
 		gint _tmp24_;
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp23_ = ix;
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp24_ = dw;
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp21_ = _tmp23_ > _tmp24_;
+#line 4069 "page-view.c"
 	}
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp25_ = _tmp21_;
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp25_) {
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp20_ = TRUE;
+#line 4077 "page-view.c"
 	} else {
 		gint _tmp26_;
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp26_ = iy;
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp20_ = _tmp26_ < 0;
+#line 4084 "page-view.c"
 	}
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp27_ = _tmp20_;
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp27_) {
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp19_ = TRUE;
+#line 4092 "page-view.c"
 	} else {
 		gint _tmp28_;
 		gint _tmp29_;
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp28_ = iy;
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp29_ = dh;
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp19_ = _tmp28_ > _tmp29_;
+#line 4102 "page-view.c"
 	}
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp30_ = _tmp19_;
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp30_) {
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = CROP_LOCATION_NONE;
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
+#line 4112 "page-view.c"
 	}
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp31_ = self->priv->page;
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp32_ = page_get_named_crop (_tmp31_);
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	name = _tmp32_;
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp33_ = name;
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp33_ != NULL) {
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = CROP_LOCATION_MIDDLE;
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_free0 (name);
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
+#line 4130 "page-view.c"
 	}
+#line 612 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	crop_border = 20;
+#line 613 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp34_ = dw;
+#line 613 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp35_ = crop_border;
+#line 613 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp34_ < (_tmp35_ * 3)) {
+#line 4140 "page-view.c"
 		gint _tmp36_;
+#line 614 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp36_ = dw;
+#line 614 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		crop_border = _tmp36_ / 3;
+#line 4146 "page-view.c"
 	}
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp37_ = dh;
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp38_ = crop_border;
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp37_ < (_tmp38_ * 3)) {
+#line 4154 "page-view.c"
 		gint _tmp39_;
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp39_ = dh;
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		crop_border = _tmp39_ / 3;
+#line 4160 "page-view.c"
 	}
+#line 619 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp41_ = ix;
+#line 619 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp42_ = crop_border;
+#line 619 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp41_ < _tmp42_) {
+#line 4168 "page-view.c"
 		gint _tmp43_;
 		gint _tmp44_;
+#line 619 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp43_ = iy;
+#line 619 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp44_ = crop_border;
+#line 619 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp40_ = _tmp43_ < _tmp44_;
+#line 4177 "page-view.c"
 	} else {
+#line 619 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp40_ = FALSE;
+#line 4181 "page-view.c"
 	}
+#line 619 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp45_ = _tmp40_;
+#line 619 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp45_) {
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = CROP_LOCATION_TOP_LEFT;
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_free0 (name);
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
+#line 4193 "page-view.c"
 	}
+#line 622 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp47_ = ix;
+#line 622 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp48_ = dw;
+#line 622 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp49_ = crop_border;
+#line 622 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp47_ > (_tmp48_ - _tmp49_)) {
+#line 4203 "page-view.c"
 		gint _tmp50_;
 		gint _tmp51_;
+#line 622 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp50_ = iy;
+#line 622 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp51_ = crop_border;
+#line 622 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp46_ = _tmp50_ < _tmp51_;
+#line 4212 "page-view.c"
 	} else {
+#line 622 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp46_ = FALSE;
+#line 4216 "page-view.c"
 	}
+#line 622 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp52_ = _tmp46_;
+#line 622 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp52_) {
+#line 623 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = CROP_LOCATION_TOP_RIGHT;
+#line 623 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_free0 (name);
+#line 623 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
+#line 4228 "page-view.c"
 	}
+#line 625 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp54_ = ix;
+#line 625 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp55_ = crop_border;
+#line 625 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp54_ < _tmp55_) {
+#line 4236 "page-view.c"
 		gint _tmp56_;
 		gint _tmp57_;
 		gint _tmp58_;
+#line 625 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp56_ = iy;
+#line 625 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp57_ = dh;
+#line 625 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp58_ = crop_border;
+#line 625 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp53_ = _tmp56_ > (_tmp57_ - _tmp58_);
+#line 4248 "page-view.c"
 	} else {
+#line 625 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp53_ = FALSE;
+#line 4252 "page-view.c"
 	}
+#line 625 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp59_ = _tmp53_;
+#line 625 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp59_) {
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = CROP_LOCATION_BOTTOM_LEFT;
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_free0 (name);
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
+#line 4264 "page-view.c"
 	}
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp61_ = ix;
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp62_ = dw;
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp63_ = crop_border;
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp61_ > (_tmp62_ - _tmp63_)) {
+#line 4274 "page-view.c"
 		gint _tmp64_;
 		gint _tmp65_;
 		gint _tmp66_;
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp64_ = iy;
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp65_ = dh;
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp66_ = crop_border;
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp60_ = _tmp64_ > (_tmp65_ - _tmp66_);
+#line 4286 "page-view.c"
 	} else {
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp60_ = FALSE;
+#line 4290 "page-view.c"
 	}
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp67_ = _tmp60_;
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp67_) {
+#line 629 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = CROP_LOCATION_BOTTOM_RIGHT;
+#line 629 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_free0 (name);
+#line 629 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
+#line 4302 "page-view.c"
 	}
+#line 632 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp68_ = ix;
+#line 632 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp69_ = crop_border;
+#line 632 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp68_ < _tmp69_) {
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = CROP_LOCATION_LEFT;
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_free0 (name);
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
+#line 4316 "page-view.c"
 	}
+#line 635 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp70_ = ix;
+#line 635 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp71_ = dw;
+#line 635 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp72_ = crop_border;
+#line 635 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp70_ > (_tmp71_ - _tmp72_)) {
+#line 636 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = CROP_LOCATION_RIGHT;
+#line 636 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_free0 (name);
+#line 636 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
+#line 4332 "page-view.c"
 	}
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp73_ = iy;
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp74_ = crop_border;
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp73_ < _tmp74_) {
+#line 639 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = CROP_LOCATION_TOP;
+#line 639 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_free0 (name);
+#line 639 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
+#line 4346 "page-view.c"
 	}
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp75_ = iy;
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp76_ = dh;
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp77_ = crop_border;
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp75_ > (_tmp76_ - _tmp77_)) {
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = CROP_LOCATION_BOTTOM;
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_free0 (name);
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
+#line 4362 "page-view.c"
 	}
+#line 645 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	result = CROP_LOCATION_MIDDLE;
+#line 645 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_g_free0 (name);
+#line 645 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
+#line 4370 "page-view.c"
 }
 
 
@@ -2804,13 +4376,21 @@ void page_view_button_press (PageView* self, gint x, gint y) {
 	gint _tmp1_;
 	CropLocation _tmp2_ = 0;
 	CropLocation _tmp3_;
+#line 648 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = x;
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = y;
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = page_view_get_crop_location (self, _tmp0_, _tmp1_);
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	location = _tmp2_;
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp3_ = location;
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp3_ != CROP_LOCATION_NONE) {
+#line 4394 "page-view.c"
 		CropLocation _tmp4_;
 		gint _tmp5_;
 		gint _tmp6_;
@@ -2819,18 +4399,31 @@ void page_view_button_press (PageView* self, gint x, gint y) {
 		gint _tmp9_ = 0;
 		gint _tmp10_ = 0;
 		gint _tmp11_ = 0;
+#line 656 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp4_ = location;
+#line 656 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		self->priv->crop_location = _tmp4_;
+#line 657 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp5_ = x;
+#line 657 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		self->priv->selected_crop_px = (gdouble) _tmp5_;
+#line 658 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp6_ = y;
+#line 658 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		self->priv->selected_crop_py = (gdouble) _tmp6_;
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp7_ = self->priv->page;
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		page_get_crop (_tmp7_, &_tmp8_, &_tmp9_, &_tmp10_, &_tmp11_);
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		self->priv->selected_crop_x = _tmp8_;
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		self->priv->selected_crop_y = _tmp9_;
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		self->priv->selected_crop_w = _tmp10_;
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		self->priv->selected_crop_h = _tmp11_;
+#line 4427 "page-view.c"
 	}
 }
 
@@ -2925,201 +4518,376 @@ void page_view_motion (PageView* self, gint x, gint y) {
 	gint _tmp164_;
 	gint _tmp165_;
 	gboolean _tmp168_;
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
+#line 668 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = x;
+#line 668 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = y;
+#line 668 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = page_view_get_crop_location (self, _tmp0_, _tmp1_);
+#line 668 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	location = _tmp2_;
+#line 670 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp3_ = location;
+#line 670 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	switch (_tmp3_) {
+#line 670 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case CROP_LOCATION_MIDDLE:
+#line 4538 "page-view.c"
 		{
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			cursor = GDK_HAND1;
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
+#line 4544 "page-view.c"
 		}
+#line 670 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case CROP_LOCATION_TOP:
+#line 4548 "page-view.c"
 		{
+#line 676 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			cursor = GDK_TOP_SIDE;
+#line 677 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
+#line 4554 "page-view.c"
 		}
+#line 670 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case CROP_LOCATION_BOTTOM:
+#line 4558 "page-view.c"
 		{
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			cursor = GDK_BOTTOM_SIDE;
+#line 680 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
+#line 4564 "page-view.c"
 		}
+#line 670 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case CROP_LOCATION_LEFT:
+#line 4568 "page-view.c"
 		{
+#line 682 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			cursor = GDK_LEFT_SIDE;
+#line 683 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
+#line 4574 "page-view.c"
 		}
+#line 670 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case CROP_LOCATION_RIGHT:
+#line 4578 "page-view.c"
 		{
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			cursor = GDK_RIGHT_SIDE;
+#line 686 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
+#line 4584 "page-view.c"
 		}
+#line 670 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case CROP_LOCATION_TOP_LEFT:
+#line 4588 "page-view.c"
 		{
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			cursor = GDK_TOP_LEFT_CORNER;
+#line 689 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
+#line 4594 "page-view.c"
 		}
+#line 670 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case CROP_LOCATION_TOP_RIGHT:
+#line 4598 "page-view.c"
 		{
+#line 691 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			cursor = GDK_TOP_RIGHT_CORNER;
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
+#line 4604 "page-view.c"
 		}
+#line 670 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case CROP_LOCATION_BOTTOM_LEFT:
+#line 4608 "page-view.c"
 		{
+#line 694 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			cursor = GDK_BOTTOM_LEFT_CORNER;
+#line 695 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
+#line 4614 "page-view.c"
 		}
+#line 670 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case CROP_LOCATION_BOTTOM_RIGHT:
+#line 4618 "page-view.c"
 		{
+#line 697 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			cursor = GDK_BOTTOM_RIGHT_CORNER;
+#line 698 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
+#line 4624 "page-view.c"
 		}
 		default:
 		{
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			cursor = GDK_ARROW;
+#line 701 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
+#line 4632 "page-view.c"
 		}
 	}
+#line 704 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp4_ = self->priv->crop_location;
+#line 704 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp4_ == CROP_LOCATION_NONE) {
+#line 4639 "page-view.c"
 		GdkCursorType _tmp5_;
+#line 706 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp5_ = cursor;
+#line 706 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		self->priv->cursor = _tmp5_;
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return;
+#line 4647 "page-view.c"
 	}
+#line 711 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp6_ = self->priv->page;
+#line 711 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp7_ = page_get_width (_tmp6_);
+#line 711 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	pw = _tmp7_;
+#line 712 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp8_ = self->priv->page;
+#line 712 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp9_ = page_get_height (_tmp8_);
+#line 712 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	ph = _tmp9_;
+#line 714 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp10_ = self->priv->page;
+#line 714 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	page_get_crop (_tmp10_, &_tmp11_, &_tmp12_, &_tmp13_, &_tmp14_);
+#line 714 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	cx = _tmp11_;
+#line 714 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	cy = _tmp12_;
+#line 714 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	cw = _tmp13_;
+#line 714 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	ch = _tmp14_;
+#line 716 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp15_ = x;
+#line 716 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp16_ = self->priv->selected_crop_px;
+#line 716 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp17_ = page_view_screen_to_page_x (self, _tmp15_ - ((gint) _tmp16_));
+#line 716 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	dx = _tmp17_;
+#line 717 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp18_ = y;
+#line 717 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp19_ = self->priv->selected_crop_py;
+#line 717 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp20_ = page_view_screen_to_page_y (self, _tmp18_ - ((gint) _tmp19_));
+#line 717 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	dy = _tmp20_;
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp21_ = self->priv->selected_crop_x;
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	new_x = _tmp21_;
+#line 720 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp22_ = self->priv->selected_crop_y;
+#line 720 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	new_y = _tmp22_;
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp23_ = self->priv->selected_crop_w;
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	new_w = _tmp23_;
+#line 722 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp24_ = self->priv->selected_crop_h;
+#line 722 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	new_h = _tmp24_;
+#line 725 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp25_ = page_view_screen_to_page_x (self, 15);
+#line 725 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	min_size = _tmp25_;
+#line 726 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp28_ = self->priv->crop_location;
+#line 726 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp28_ == CROP_LOCATION_TOP_LEFT) {
+#line 726 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp27_ = TRUE;
+#line 4715 "page-view.c"
 	} else {
 		CropLocation _tmp29_;
+#line 727 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp29_ = self->priv->crop_location;
+#line 727 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp27_ = _tmp29_ == CROP_LOCATION_LEFT;
+#line 4722 "page-view.c"
 	}
+#line 726 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp30_ = _tmp27_;
+#line 726 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp30_) {
+#line 726 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp26_ = TRUE;
+#line 4730 "page-view.c"
 	} else {
 		CropLocation _tmp31_;
+#line 728 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp31_ = self->priv->crop_location;
+#line 728 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp26_ = _tmp31_ == CROP_LOCATION_BOTTOM_LEFT;
+#line 4737 "page-view.c"
 	}
+#line 726 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp32_ = _tmp26_;
+#line 726 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp32_) {
+#line 4743 "page-view.c"
 		gint _tmp33_;
 		gint _tmp34_;
 		gint _tmp35_;
 		gint _tmp38_;
 		gint _tmp39_;
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp33_ = dx;
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp34_ = new_w;
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp35_ = min_size;
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if (_tmp33_ > (_tmp34_ - _tmp35_)) {
+#line 4757 "page-view.c"
 			gint _tmp36_;
 			gint _tmp37_;
+#line 731 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp36_ = new_w;
+#line 731 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp37_ = min_size;
+#line 731 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			dx = _tmp36_ - _tmp37_;
+#line 4766 "page-view.c"
 		}
+#line 732 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp38_ = new_x;
+#line 732 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp39_ = dx;
+#line 732 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if ((_tmp38_ + _tmp39_) < 0) {
+#line 4774 "page-view.c"
 			gint _tmp40_;
+#line 733 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp40_ = new_x;
+#line 733 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			dx = -_tmp40_;
+#line 4780 "page-view.c"
 		}
 	}
+#line 735 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp43_ = self->priv->crop_location;
+#line 735 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp43_ == CROP_LOCATION_TOP_LEFT) {
+#line 735 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp42_ = TRUE;
+#line 4789 "page-view.c"
 	} else {
 		CropLocation _tmp44_;
+#line 736 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp44_ = self->priv->crop_location;
+#line 736 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp42_ = _tmp44_ == CROP_LOCATION_TOP;
+#line 4796 "page-view.c"
 	}
+#line 735 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp45_ = _tmp42_;
+#line 735 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp45_) {
+#line 735 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp41_ = TRUE;
+#line 4804 "page-view.c"
 	} else {
 		CropLocation _tmp46_;
+#line 737 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp46_ = self->priv->crop_location;
+#line 737 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp41_ = _tmp46_ == CROP_LOCATION_TOP_RIGHT;
+#line 4811 "page-view.c"
 	}
+#line 735 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp47_ = _tmp41_;
+#line 735 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp47_) {
+#line 4817 "page-view.c"
 		gint _tmp48_;
 		gint _tmp49_;
 		gint _tmp50_;
 		gint _tmp53_;
 		gint _tmp54_;
+#line 739 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp48_ = dy;
+#line 739 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp49_ = new_h;
+#line 739 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp50_ = min_size;
+#line 739 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if (_tmp48_ > (_tmp49_ - _tmp50_)) {
+#line 4831 "page-view.c"
 			gint _tmp51_;
 			gint _tmp52_;
+#line 740 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp51_ = new_h;
+#line 740 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp52_ = min_size;
+#line 740 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			dy = _tmp51_ - _tmp52_;
+#line 4840 "page-view.c"
 		}
+#line 741 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp53_ = new_y;
+#line 741 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp54_ = dy;
+#line 741 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if ((_tmp53_ + _tmp54_) < 0) {
+#line 4848 "page-view.c"
 			gint _tmp55_;
+#line 742 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp55_ = new_y;
+#line 742 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			dy = -_tmp55_;
+#line 4854 "page-view.c"
 		}
 	}
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp58_ = self->priv->crop_location;
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp58_ == CROP_LOCATION_TOP_RIGHT) {
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp57_ = TRUE;
+#line 4863 "page-view.c"
 	} else {
 		CropLocation _tmp59_;
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp59_ = self->priv->crop_location;
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp57_ = _tmp59_ == CROP_LOCATION_RIGHT;
+#line 4870 "page-view.c"
 	}
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp60_ = _tmp57_;
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp60_) {
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp56_ = TRUE;
+#line 4878 "page-view.c"
 	} else {
 		CropLocation _tmp61_;
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp61_ = self->priv->crop_location;
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp56_ = _tmp61_ == CROP_LOCATION_BOTTOM_RIGHT;
+#line 4885 "page-view.c"
 	}
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp62_ = _tmp56_;
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp62_) {
+#line 4891 "page-view.c"
 		gint _tmp63_;
 		gint _tmp64_;
 		gint _tmp65_;
@@ -3127,48 +4895,85 @@ void page_view_motion (PageView* self, gint x, gint y) {
 		gint _tmp69_;
 		gint _tmp70_;
 		gint _tmp71_;
+#line 749 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp63_ = dx;
+#line 749 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp64_ = min_size;
+#line 749 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp65_ = new_w;
+#line 749 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if (_tmp63_ < (_tmp64_ - _tmp65_)) {
+#line 4907 "page-view.c"
 			gint _tmp66_;
 			gint _tmp67_;
+#line 750 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp66_ = min_size;
+#line 750 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp67_ = new_w;
+#line 750 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			dx = _tmp66_ - _tmp67_;
+#line 4916 "page-view.c"
 		}
+#line 751 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp68_ = new_x;
+#line 751 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp69_ = new_w;
+#line 751 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp70_ = dx;
+#line 751 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp71_ = pw;
+#line 751 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if (((_tmp68_ + _tmp69_) + _tmp70_) > _tmp71_) {
+#line 4928 "page-view.c"
 			gint _tmp72_;
 			gint _tmp73_;
 			gint _tmp74_;
+#line 752 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp72_ = pw;
+#line 752 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp73_ = new_x;
+#line 752 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp74_ = new_w;
+#line 752 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			dx = (_tmp72_ - _tmp73_) - _tmp74_;
+#line 4940 "page-view.c"
 		}
 	}
+#line 754 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp77_ = self->priv->crop_location;
+#line 754 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp77_ == CROP_LOCATION_BOTTOM_LEFT) {
+#line 754 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp76_ = TRUE;
+#line 4949 "page-view.c"
 	} else {
 		CropLocation _tmp78_;
+#line 755 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp78_ = self->priv->crop_location;
+#line 755 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp76_ = _tmp78_ == CROP_LOCATION_BOTTOM;
+#line 4956 "page-view.c"
 	}
+#line 754 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp79_ = _tmp76_;
+#line 754 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp79_) {
+#line 754 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp75_ = TRUE;
+#line 4964 "page-view.c"
 	} else {
 		CropLocation _tmp80_;
+#line 756 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp80_ = self->priv->crop_location;
+#line 756 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp75_ = _tmp80_ == CROP_LOCATION_BOTTOM_RIGHT;
+#line 4971 "page-view.c"
 	}
+#line 754 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp81_ = _tmp75_;
+#line 754 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp81_) {
+#line 4977 "page-view.c"
 		gint _tmp82_;
 		gint _tmp83_;
 		gint _tmp84_;
@@ -3176,32 +4981,55 @@ void page_view_motion (PageView* self, gint x, gint y) {
 		gint _tmp88_;
 		gint _tmp89_;
 		gint _tmp90_;
+#line 758 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp82_ = dy;
+#line 758 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp83_ = min_size;
+#line 758 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp84_ = new_h;
+#line 758 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if (_tmp82_ < (_tmp83_ - _tmp84_)) {
+#line 4993 "page-view.c"
 			gint _tmp85_;
 			gint _tmp86_;
+#line 759 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp85_ = min_size;
+#line 759 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp86_ = new_h;
+#line 759 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			dy = _tmp85_ - _tmp86_;
+#line 5002 "page-view.c"
 		}
+#line 760 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp87_ = new_y;
+#line 760 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp88_ = new_h;
+#line 760 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp89_ = dy;
+#line 760 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp90_ = ph;
+#line 760 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if (((_tmp87_ + _tmp88_) + _tmp89_) > _tmp90_) {
+#line 5014 "page-view.c"
 			gint _tmp91_;
 			gint _tmp92_;
 			gint _tmp93_;
+#line 761 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp91_ = ph;
+#line 761 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp92_ = new_y;
+#line 761 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp93_ = new_h;
+#line 761 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			dy = (_tmp91_ - _tmp92_) - _tmp93_;
+#line 5026 "page-view.c"
 		}
 	}
+#line 763 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp94_ = self->priv->crop_location;
+#line 763 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp94_ == CROP_LOCATION_MIDDLE) {
+#line 5033 "page-view.c"
 		gint _tmp95_;
 		gint _tmp96_;
 		gint _tmp97_;
@@ -3214,208 +5042,374 @@ void page_view_motion (PageView* self, gint x, gint y) {
 		gint _tmp108_;
 		gint _tmp112_;
 		gint _tmp113_;
+#line 765 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp95_ = new_x;
+#line 765 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp96_ = dx;
+#line 765 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp97_ = new_w;
+#line 765 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp98_ = pw;
+#line 765 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if (((_tmp95_ + _tmp96_) + _tmp97_) > _tmp98_) {
+#line 5056 "page-view.c"
 			gint _tmp99_;
 			gint _tmp100_;
 			gint _tmp101_;
+#line 766 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp99_ = pw;
+#line 766 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp100_ = new_x;
+#line 766 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp101_ = new_w;
+#line 766 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			dx = (_tmp99_ - _tmp100_) - _tmp101_;
+#line 5068 "page-view.c"
 		}
+#line 767 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp102_ = new_x;
+#line 767 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp103_ = dx;
+#line 767 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if ((_tmp102_ + _tmp103_) < 0) {
+#line 5076 "page-view.c"
 			gint _tmp104_;
+#line 768 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp104_ = new_x;
+#line 768 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			dx = -_tmp104_;
+#line 5082 "page-view.c"
 		}
+#line 769 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp105_ = new_y;
+#line 769 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp106_ = dy;
+#line 769 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp107_ = new_h;
+#line 769 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp108_ = ph;
+#line 769 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if (((_tmp105_ + _tmp106_) + _tmp107_) > _tmp108_) {
+#line 5094 "page-view.c"
 			gint _tmp109_;
 			gint _tmp110_;
 			gint _tmp111_;
+#line 770 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp109_ = ph;
+#line 770 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp110_ = new_y;
+#line 770 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp111_ = new_h;
+#line 770 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			dy = (_tmp109_ - _tmp110_) - _tmp111_;
+#line 5106 "page-view.c"
 		}
+#line 771 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp112_ = new_y;
+#line 771 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp113_ = dy;
+#line 771 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if ((_tmp112_ + _tmp113_) < 0) {
+#line 5114 "page-view.c"
 			gint _tmp114_;
+#line 772 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp114_ = new_y;
+#line 772 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			dy = -_tmp114_;
+#line 5120 "page-view.c"
 		}
 	}
+#line 776 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp115_ = self->priv->crop_location;
+#line 776 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp115_ == CROP_LOCATION_MIDDLE) {
+#line 5127 "page-view.c"
 		gint _tmp116_;
 		gint _tmp117_;
 		gint _tmp118_;
 		gint _tmp119_;
+#line 778 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp116_ = new_x;
+#line 778 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp117_ = dx;
+#line 778 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		new_x = _tmp116_ + _tmp117_;
+#line 779 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp118_ = new_y;
+#line 779 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp119_ = dy;
+#line 779 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		new_y = _tmp118_ + _tmp119_;
+#line 5144 "page-view.c"
 	}
+#line 781 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp122_ = self->priv->crop_location;
+#line 781 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp122_ == CROP_LOCATION_TOP_LEFT) {
+#line 781 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp121_ = TRUE;
+#line 5152 "page-view.c"
 	} else {
 		CropLocation _tmp123_;
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp123_ = self->priv->crop_location;
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp121_ = _tmp123_ == CROP_LOCATION_LEFT;
+#line 5159 "page-view.c"
 	}
+#line 781 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp124_ = _tmp121_;
+#line 781 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp124_) {
+#line 781 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp120_ = TRUE;
+#line 5167 "page-view.c"
 	} else {
 		CropLocation _tmp125_;
+#line 783 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp125_ = self->priv->crop_location;
+#line 783 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp120_ = _tmp125_ == CROP_LOCATION_BOTTOM_LEFT;
+#line 5174 "page-view.c"
 	}
+#line 781 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp126_ = _tmp120_;
+#line 781 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp126_) {
+#line 5180 "page-view.c"
 		gint _tmp127_;
 		gint _tmp128_;
 		gint _tmp129_;
 		gint _tmp130_;
+#line 785 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp127_ = new_x;
+#line 785 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp128_ = dx;
+#line 785 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		new_x = _tmp127_ + _tmp128_;
+#line 786 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp129_ = new_w;
+#line 786 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp130_ = dx;
+#line 786 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		new_w = _tmp129_ - _tmp130_;
+#line 5197 "page-view.c"
 	}
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp133_ = self->priv->crop_location;
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp133_ == CROP_LOCATION_TOP_LEFT) {
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp132_ = TRUE;
+#line 5205 "page-view.c"
 	} else {
 		CropLocation _tmp134_;
+#line 789 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp134_ = self->priv->crop_location;
+#line 789 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp132_ = _tmp134_ == CROP_LOCATION_TOP;
+#line 5212 "page-view.c"
 	}
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp135_ = _tmp132_;
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp135_) {
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp131_ = TRUE;
+#line 5220 "page-view.c"
 	} else {
 		CropLocation _tmp136_;
+#line 790 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp136_ = self->priv->crop_location;
+#line 790 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp131_ = _tmp136_ == CROP_LOCATION_TOP_RIGHT;
+#line 5227 "page-view.c"
 	}
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp137_ = _tmp131_;
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp137_) {
+#line 5233 "page-view.c"
 		gint _tmp138_;
 		gint _tmp139_;
 		gint _tmp140_;
 		gint _tmp141_;
+#line 792 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp138_ = new_y;
+#line 792 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp139_ = dy;
+#line 792 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		new_y = _tmp138_ + _tmp139_;
+#line 793 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp140_ = new_h;
+#line 793 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp141_ = dy;
+#line 793 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		new_h = _tmp140_ - _tmp141_;
+#line 5250 "page-view.c"
 	}
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp144_ = self->priv->crop_location;
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp144_ == CROP_LOCATION_TOP_RIGHT) {
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp143_ = TRUE;
+#line 5258 "page-view.c"
 	} else {
 		CropLocation _tmp145_;
+#line 797 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp145_ = self->priv->crop_location;
+#line 797 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp143_ = _tmp145_ == CROP_LOCATION_RIGHT;
+#line 5265 "page-view.c"
 	}
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp146_ = _tmp143_;
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp146_) {
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp142_ = TRUE;
+#line 5273 "page-view.c"
 	} else {
 		CropLocation _tmp147_;
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp147_ = self->priv->crop_location;
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp142_ = _tmp147_ == CROP_LOCATION_BOTTOM_RIGHT;
+#line 5280 "page-view.c"
 	}
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp148_ = _tmp142_;
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp148_) {
+#line 5286 "page-view.c"
 		gint _tmp149_;
 		gint _tmp150_;
+#line 799 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp149_ = new_w;
+#line 799 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp150_ = dx;
+#line 799 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		new_w = _tmp149_ + _tmp150_;
+#line 5295 "page-view.c"
 	}
+#line 800 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp153_ = self->priv->crop_location;
+#line 800 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp153_ == CROP_LOCATION_BOTTOM_LEFT) {
+#line 800 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp152_ = TRUE;
+#line 5303 "page-view.c"
 	} else {
 		CropLocation _tmp154_;
+#line 801 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp154_ = self->priv->crop_location;
+#line 801 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp152_ = _tmp154_ == CROP_LOCATION_BOTTOM;
+#line 5310 "page-view.c"
 	}
+#line 800 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp155_ = _tmp152_;
+#line 800 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp155_) {
+#line 800 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp151_ = TRUE;
+#line 5318 "page-view.c"
 	} else {
 		CropLocation _tmp156_;
+#line 802 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp156_ = self->priv->crop_location;
+#line 802 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp151_ = _tmp156_ == CROP_LOCATION_BOTTOM_RIGHT;
+#line 5325 "page-view.c"
 	}
+#line 800 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp157_ = _tmp151_;
+#line 800 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp157_) {
+#line 5331 "page-view.c"
 		gint _tmp158_;
 		gint _tmp159_;
+#line 803 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp158_ = new_h;
+#line 803 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp159_ = dy;
+#line 803 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		new_h = _tmp158_ + _tmp159_;
+#line 5340 "page-view.c"
 	}
+#line 805 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp160_ = self->priv->page;
+#line 805 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp161_ = new_x;
+#line 805 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp162_ = new_y;
+#line 805 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	page_move_crop (_tmp160_, _tmp161_, _tmp162_);
+#line 808 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp164_ = new_w;
+#line 808 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp165_ = cw;
+#line 808 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp164_ != _tmp165_) {
+#line 808 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp163_ = TRUE;
+#line 5358 "page-view.c"
 	} else {
 		gint _tmp166_;
 		gint _tmp167_;
+#line 808 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp166_ = new_h;
+#line 808 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp167_ = ch;
+#line 808 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp163_ = _tmp166_ != _tmp167_;
+#line 5368 "page-view.c"
 	}
+#line 808 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp168_ = _tmp163_;
+#line 808 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp168_) {
+#line 5374 "page-view.c"
 		Page* _tmp169_;
 		gint _tmp170_;
 		gint _tmp171_;
+#line 809 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp169_ = self->priv->page;
+#line 809 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp170_ = new_w;
+#line 809 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp171_ = new_h;
+#line 809 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		page_set_custom_crop (_tmp169_, _tmp170_, _tmp171_);
+#line 5386 "page-view.c"
 	}
 }
 
 
 void page_view_button_release (PageView* self, gint x, gint y) {
+#line 812 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
+#line 815 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->crop_location = CROP_LOCATION_NONE;
+#line 816 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "changed");
+#line 5398 "page-view.c"
 }
 
 
 GdkCursorType page_view_get_cursor (PageView* self) {
 	GdkCursorType result = 0;
 	GdkCursorType _tmp0_;
+#line 819 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, 0);
+#line 821 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = self->priv->cursor;
+#line 821 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	result = _tmp0_;
+#line 821 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
+#line 5413 "page-view.c"
 }
 
 
@@ -3423,20 +5417,30 @@ static gboolean page_view_animation_cb (PageView* self) {
 	gboolean result = FALSE;
 	gint _tmp0_;
 	gint _tmp1_;
+#line 824 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
+#line 826 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = self->priv->animate_segment;
+#line 826 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = self->priv->animate_n_segments;
+#line 826 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->animate_segment = (_tmp0_ + 1) % _tmp1_;
+#line 827 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "changed");
+#line 828 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	result = TRUE;
+#line 828 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
+#line 5435 "page-view.c"
 }
 
 
 static gboolean _page_view_animation_cb_gsource_func (gpointer self) {
 	gboolean result;
 	result = page_view_animation_cb (self);
+#line 844 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
+#line 5444 "page-view.c"
 }
 
 
@@ -3451,46 +5455,84 @@ static void page_view_update_animation (PageView* self) {
 	gboolean _tmp7_;
 	gboolean _tmp8_;
 	gboolean _tmp9_;
+#line 831 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
+#line 835 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = self->priv->page;
+#line 835 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = page_is_scanning (_tmp1_);
+#line 835 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp2_) {
+#line 5467 "page-view.c"
 		Page* _tmp3_;
 		gboolean _tmp4_ = FALSE;
+#line 835 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp3_ = self->priv->page;
+#line 835 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp4_ = page_has_data (_tmp3_);
+#line 835 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp0_ = !_tmp4_;
+#line 5476 "page-view.c"
 	} else {
+#line 835 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp0_ = FALSE;
+#line 5480 "page-view.c"
 	}
+#line 835 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp5_ = _tmp0_;
+#line 835 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	animate = _tmp5_;
+#line 836 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp6_ = self->priv->animate_timeout;
+#line 836 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	is_animating = _tmp6_ != ((guint) 0);
+#line 837 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp7_ = animate;
+#line 837 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp8_ = is_animating;
+#line 837 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp7_ == _tmp8_) {
+#line 838 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return;
+#line 5498 "page-view.c"
 	}
+#line 840 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp9_ = animate;
+#line 840 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp9_) {
+#line 5504 "page-view.c"
 		guint _tmp10_;
+#line 842 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		self->priv->animate_segment = 0;
+#line 843 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp10_ = self->priv->animate_timeout;
+#line 843 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if (_tmp10_ == ((guint) 0)) {
+#line 5512 "page-view.c"
 			guint _tmp11_ = 0U;
+#line 844 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp11_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 150, _page_view_animation_cb_gsource_func, page_view_ref (self), page_view_unref);
+#line 844 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			self->priv->animate_timeout = _tmp11_;
+#line 5518 "page-view.c"
 		}
 	} else {
 		guint _tmp12_;
+#line 848 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp12_ = self->priv->animate_timeout;
+#line 848 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if (_tmp12_ != ((guint) 0)) {
+#line 5526 "page-view.c"
 			guint _tmp13_;
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp13_ = self->priv->animate_timeout;
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			g_source_remove (_tmp13_);
+#line 5532 "page-view.c"
 		}
+#line 850 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		self->priv->animate_timeout = (guint) 0;
+#line 5536 "page-view.c"
 	}
 }
 
@@ -3531,57 +5573,108 @@ void page_view_render (PageView* self, cairo_t* context) {
 	gboolean _tmp75_;
 	Page* _tmp115_;
 	gboolean _tmp116_ = FALSE;
+#line 854 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
+#line 854 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (context != NULL);
+#line 856 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	page_view_update_animation (self);
+#line 857 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	page_view_update_page_view (self);
+#line 859 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = page_view_get_preview_width (self);
+#line 859 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	w = _tmp0_;
+#line 860 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = page_view_get_preview_height (self);
+#line 860 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	h = _tmp1_;
+#line 862 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = context;
+#line 862 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	cairo_set_line_width (_tmp2_, (gdouble) 1);
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp3_ = context;
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp4_ = self->priv->x_offset;
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp5_ = self->priv->y_offset;
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	cairo_translate (_tmp3_, (gdouble) _tmp4_, (gdouble) _tmp5_);
+#line 866 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp6_ = context;
+#line 866 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	cairo_set_source_rgb (_tmp6_, (gdouble) 0, (gdouble) 0, (gdouble) 0);
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp7_ = context;
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp8_ = self->priv->border_width;
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	cairo_set_line_width (_tmp7_, (gdouble) _tmp8_);
+#line 868 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp9_ = context;
+#line 868 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp10_ = self->priv->border_width;
+#line 868 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp11_ = self->priv->border_width;
+#line 868 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp12_ = self->priv->width;
+#line 868 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp13_ = self->priv->border_width;
+#line 868 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp14_ = self->priv->height;
+#line 868 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp15_ = self->priv->border_width;
+#line 868 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	cairo_rectangle (_tmp9_, ((gdouble) _tmp10_) / 2, ((gdouble) _tmp11_) / 2, (gdouble) (_tmp12_ - _tmp13_), (gdouble) (_tmp14_ - _tmp15_));
+#line 872 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp16_ = context;
+#line 872 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	cairo_stroke (_tmp16_);
+#line 875 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp17_ = context;
+#line 875 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp18_ = self->priv->border_width;
+#line 875 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp19_ = self->priv->border_width;
+#line 875 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	cairo_translate (_tmp17_, (gdouble) _tmp18_, (gdouble) _tmp19_);
+#line 876 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp20_ = context;
+#line 876 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp21_ = self->priv->image;
+#line 876 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	gdk_cairo_set_source_pixbuf (_tmp20_, _tmp21_, (gdouble) 0, (gdouble) 0);
+#line 877 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp22_ = context;
+#line 877 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	cairo_paint (_tmp22_);
+#line 880 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp24_ = self->priv->page;
+#line 880 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp25_ = page_is_scanning (_tmp24_);
+#line 880 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp25_) {
+#line 5659 "page-view.c"
 		Page* _tmp26_;
 		gboolean _tmp27_ = FALSE;
+#line 880 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp26_ = self->priv->page;
+#line 880 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp27_ = page_has_data (_tmp26_);
+#line 880 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp23_ = !_tmp27_;
+#line 5668 "page-view.c"
 	} else {
+#line 880 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp23_ = FALSE;
+#line 5672 "page-view.c"
 	}
+#line 880 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp28_ = _tmp23_;
+#line 880 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp28_) {
+#line 5678 "page-view.c"
 		gdouble outer_radius = 0.0;
 		gint _tmp29_;
 		gint _tmp30_;
@@ -3602,41 +5695,74 @@ void page_view_render (PageView* self, cairo_t* context) {
 		gdouble _tmp44_ = 0.0;
 		gdouble inner_radius;
 		gdouble offset;
+#line 883 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp29_ = w;
+#line 883 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp30_ = h;
+#line 883 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if (_tmp29_ > _tmp30_) {
+#line 5705 "page-view.c"
 			gint _tmp31_;
+#line 884 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp31_ = w;
+#line 884 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			outer_radius = 0.15 * _tmp31_;
+#line 5711 "page-view.c"
 		} else {
 			gint _tmp32_;
+#line 886 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp32_ = h;
+#line 886 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			outer_radius = 0.15 * _tmp32_;
+#line 5718 "page-view.c"
 		}
+#line 887 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp33_ = self->priv->animate_n_segments;
+#line 887 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		arc = G_PI / _tmp33_;
+#line 890 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp34_ = outer_radius;
+#line 890 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp35_ = arc;
+#line 890 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp36_ = sin (_tmp35_);
+#line 890 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		x = _tmp34_ * _tmp36_;
+#line 891 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp37_ = outer_radius;
+#line 891 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp38_ = arc;
+#line 891 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp39_ = cos (_tmp38_);
+#line 891 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		y = _tmp37_ * (_tmp39_ - 1.0);
+#line 892 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp40_ = x;
+#line 892 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp41_ = x;
+#line 892 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp42_ = y;
+#line 892 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp43_ = y;
+#line 892 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp44_ = sqrt ((_tmp40_ * _tmp41_) + (_tmp42_ * _tmp43_));
+#line 892 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		inner_radius = 0.6 * _tmp44_;
+#line 894 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		offset = 0.0;
+#line 5754 "page-view.c"
 		{
 			gint i;
+#line 895 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			i = 0;
+#line 5759 "page-view.c"
 			{
 				gboolean _tmp45_;
+#line 895 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp45_ = TRUE;
+#line 895 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				while (TRUE) {
+#line 5766 "page-view.c"
 					gboolean _tmp46_;
 					gint _tmp50_;
 					gint _tmp51_;
@@ -3656,69 +5782,126 @@ void page_view_render (PageView* self, cairo_t* context) {
 					gint _tmp65_;
 					cairo_t* _tmp68_;
 					cairo_t* _tmp69_;
+#line 895 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp46_ = _tmp45_;
+#line 895 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					if (!_tmp46_) {
+#line 5790 "page-view.c"
 						gint _tmp47_;
 						gdouble _tmp48_;
 						gdouble _tmp49_;
+#line 895 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp47_ = i;
+#line 895 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						i = _tmp47_ + 1;
+#line 895 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp48_ = offset;
+#line 895 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp49_ = arc;
+#line 895 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						offset = _tmp48_ + (_tmp49_ * 2);
+#line 5804 "page-view.c"
 					}
+#line 895 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp45_ = FALSE;
+#line 895 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp50_ = i;
+#line 895 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp51_ = self->priv->animate_n_segments;
+#line 895 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					if (!(_tmp50_ < _tmp51_)) {
+#line 895 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						break;
+#line 5816 "page-view.c"
 					}
+#line 897 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp52_ = w;
+#line 897 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp53_ = outer_radius;
+#line 897 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp54_ = offset;
+#line 897 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp55_ = sin (_tmp54_);
+#line 897 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					x = (_tmp52_ / 2) + (_tmp53_ * _tmp55_);
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp56_ = h;
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp57_ = outer_radius;
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp58_ = offset;
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp59_ = cos (_tmp58_);
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					y = (_tmp56_ / 2) - (_tmp57_ * _tmp59_);
+#line 899 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp60_ = context;
+#line 899 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp61_ = x;
+#line 899 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp62_ = y;
+#line 899 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp63_ = inner_radius;
+#line 899 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					cairo_arc (_tmp60_, _tmp61_, _tmp62_, _tmp63_, (gdouble) 0, 2 * G_PI);
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp64_ = i;
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp65_ = self->priv->animate_segment;
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					if (_tmp64_ == _tmp65_) {
+#line 5854 "page-view.c"
 						cairo_t* _tmp66_;
 						cairo_t* _tmp67_;
+#line 903 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp66_ = context;
+#line 903 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						cairo_set_source_rgb (_tmp66_, 0.75, 0.75, 0.75);
+#line 904 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp67_ = context;
+#line 904 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						cairo_fill_preserve (_tmp67_);
+#line 5865 "page-view.c"
 					}
+#line 907 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp68_ = context;
+#line 907 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					cairo_set_source_rgb (_tmp68_, 0.5, 0.5, 0.5);
+#line 908 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp69_ = context;
+#line 908 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					cairo_stroke (_tmp69_);
+#line 5875 "page-view.c"
 				}
 			}
 		}
 	}
+#line 913 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp71_ = self->priv->page;
+#line 913 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp72_ = page_is_scanning (_tmp71_);
+#line 913 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp72_) {
+#line 5886 "page-view.c"
 		Page* _tmp73_;
 		gint _tmp74_ = 0;
+#line 913 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp73_ = self->priv->page;
+#line 913 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp74_ = page_get_scan_line (_tmp73_);
+#line 913 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp70_ = _tmp74_ > 0;
+#line 5895 "page-view.c"
 	} else {
+#line 913 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp70_ = FALSE;
+#line 5899 "page-view.c"
 	}
+#line 913 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp75_ = _tmp70_;
+#line 913 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp75_) {
+#line 5905 "page-view.c"
 		Page* _tmp76_;
 		gint _tmp77_ = 0;
 		gint scan_line;
@@ -3737,32 +5920,54 @@ void page_view_render (PageView* self, cairo_t* context) {
 		gdouble _tmp112_;
 		cairo_t* _tmp113_;
 		cairo_t* _tmp114_;
+#line 915 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp76_ = self->priv->page;
+#line 915 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp77_ = page_get_scan_line (_tmp76_);
+#line 915 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		scan_line = _tmp77_;
+#line 919 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp78_ = self->priv->page;
+#line 919 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp79_ = page_get_scan_direction (_tmp78_);
+#line 919 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		switch (_tmp79_) {
+#line 919 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			case SCAN_DIRECTION_TOP_TO_BOTTOM:
+#line 5938 "page-view.c"
 			{
 				gint _tmp80_;
 				gint _tmp81_ = 0;
 				gdouble _tmp82_;
 				gint _tmp83_;
 				gdouble _tmp84_;
+#line 922 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp80_ = scan_line;
+#line 922 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp81_ = page_view_page_to_screen_y (self, _tmp80_);
+#line 922 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				s = (gdouble) _tmp81_;
+#line 923 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				x1 = (gdouble) 0;
+#line 923 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp82_ = s;
+#line 923 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				y1 = _tmp82_ + 0.5;
+#line 924 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp83_ = w;
+#line 924 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				x2 = (gdouble) _tmp83_;
+#line 924 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp84_ = s;
+#line 924 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				y2 = _tmp84_ + 0.5;
+#line 925 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				break;
+#line 5967 "page-view.c"
 			}
+#line 919 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			case SCAN_DIRECTION_BOTTOM_TO_TOP:
+#line 5971 "page-view.c"
 			{
 				gint _tmp85_;
 				gint _tmp86_ = 0;
@@ -3771,40 +5976,70 @@ void page_view_render (PageView* self, cairo_t* context) {
 				gint _tmp89_;
 				gint _tmp90_;
 				gdouble _tmp91_;
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp85_ = scan_line;
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp86_ = page_view_page_to_screen_y (self, _tmp85_);
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				s = (gdouble) _tmp86_;
+#line 928 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				x1 = (gdouble) 0;
+#line 928 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp87_ = h;
+#line 928 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp88_ = s;
+#line 928 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				y1 = (_tmp87_ - _tmp88_) + 0.5;
+#line 929 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp89_ = w;
+#line 929 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				x2 = (gdouble) _tmp89_;
+#line 929 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp90_ = h;
+#line 929 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp91_ = s;
+#line 929 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				y2 = (_tmp90_ - _tmp91_) + 0.5;
+#line 930 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				break;
+#line 6006 "page-view.c"
 			}
+#line 919 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			case SCAN_DIRECTION_LEFT_TO_RIGHT:
+#line 6010 "page-view.c"
 			{
 				gint _tmp92_;
 				gint _tmp93_ = 0;
 				gdouble _tmp94_;
 				gdouble _tmp95_;
 				gint _tmp96_;
+#line 932 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp92_ = scan_line;
+#line 932 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp93_ = page_view_page_to_screen_x (self, _tmp92_);
+#line 932 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				s = (gdouble) _tmp93_;
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp94_ = s;
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				x1 = _tmp94_ + 0.5;
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				y1 = (gdouble) 0;
+#line 934 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp95_ = s;
+#line 934 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				x2 = _tmp95_ + 0.5;
+#line 934 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp96_ = h;
+#line 934 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				y2 = (gdouble) _tmp96_;
+#line 935 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				break;
+#line 6039 "page-view.c"
 			}
+#line 919 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			case SCAN_DIRECTION_RIGHT_TO_LEFT:
+#line 6043 "page-view.c"
 			{
 				gint _tmp97_;
 				gint _tmp98_ = 0;
@@ -3813,51 +6048,91 @@ void page_view_render (PageView* self, cairo_t* context) {
 				gint _tmp101_;
 				gdouble _tmp102_;
 				gint _tmp103_;
+#line 937 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp97_ = scan_line;
+#line 937 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp98_ = page_view_page_to_screen_x (self, _tmp97_);
+#line 937 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				s = (gdouble) _tmp98_;
+#line 938 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp99_ = w;
+#line 938 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp100_ = s;
+#line 938 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				x1 = (_tmp99_ - _tmp100_) + 0.5;
+#line 938 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				y1 = (gdouble) 0;
+#line 939 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp101_ = w;
+#line 939 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp102_ = s;
+#line 939 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				x2 = (_tmp101_ - _tmp102_) + 0.5;
+#line 939 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp103_ = h;
+#line 939 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				y2 = (gdouble) _tmp103_;
+#line 940 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				break;
+#line 6078 "page-view.c"
 			}
 			default:
 			{
 				gdouble _tmp104_;
 				gdouble _tmp105_;
 				gdouble _tmp106_;
+#line 942 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				y2 = (gdouble) 0;
+#line 942 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp104_ = y2;
+#line 942 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				x2 = _tmp104_;
+#line 942 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp105_ = x2;
+#line 942 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				y1 = _tmp105_;
+#line 942 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp106_ = y1;
+#line 942 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				x1 = _tmp106_;
+#line 943 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				break;
+#line 6101 "page-view.c"
 			}
 		}
+#line 946 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp107_ = context;
+#line 946 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp108_ = x1;
+#line 946 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp109_ = y1;
+#line 946 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		cairo_move_to (_tmp107_, _tmp108_, _tmp109_);
+#line 947 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp110_ = context;
+#line 947 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp111_ = x2;
+#line 947 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp112_ = y2;
+#line 947 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		cairo_line_to (_tmp110_, _tmp111_, _tmp112_);
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp113_ = context;
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		cairo_set_source_rgb (_tmp113_, 1.0, 0.0, 0.0);
+#line 949 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp114_ = context;
+#line 949 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		cairo_stroke (_tmp114_);
+#line 6128 "page-view.c"
 	}
+#line 953 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp115_ = self->priv->page;
+#line 953 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp116_ = page_has_crop (_tmp115_);
+#line 953 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp116_) {
+#line 6136 "page-view.c"
 		gint x = 0;
 		gint y = 0;
 		gint crop_width = 0;
@@ -3905,62 +6180,119 @@ void page_view_render (PageView* self, cairo_t* context) {
 		gint _tmp153_;
 		cairo_t* _tmp154_;
 		cairo_t* _tmp155_;
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp117_ = self->priv->page;
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		page_get_crop (_tmp117_, &_tmp118_, &_tmp119_, &_tmp120_, &_tmp121_);
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		x = _tmp118_;
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		y = _tmp119_;
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		crop_width = _tmp120_;
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		crop_height = _tmp121_;
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp122_ = x;
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp123_ = page_view_page_to_screen_x (self, _tmp122_);
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		dx = _tmp123_;
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp124_ = y;
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp125_ = page_view_page_to_screen_y (self, _tmp124_);
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		dy = _tmp125_;
+#line 960 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp126_ = crop_width;
+#line 960 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp127_ = page_view_page_to_screen_x (self, _tmp126_);
+#line 960 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		dw = _tmp127_;
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp128_ = crop_height;
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp129_ = page_view_page_to_screen_y (self, _tmp128_);
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		dh = _tmp129_;
+#line 964 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp130_ = context;
+#line 964 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp131_ = w;
+#line 964 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp132_ = h;
+#line 964 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		cairo_rectangle (_tmp130_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp131_, (gdouble) _tmp132_);
+#line 965 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp133_ = context;
+#line 965 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		cairo_new_sub_path (_tmp133_);
+#line 966 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp134_ = context;
+#line 966 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp135_ = dx;
+#line 966 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp136_ = dy;
+#line 966 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp137_ = dw;
+#line 966 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp138_ = dh;
+#line 966 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		cairo_rectangle (_tmp134_, (gdouble) _tmp135_, (gdouble) _tmp136_, (gdouble) _tmp137_, (gdouble) _tmp138_);
+#line 967 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp139_ = context;
+#line 967 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		cairo_set_fill_rule (_tmp139_, CAIRO_FILL_RULE_EVEN_ODD);
+#line 968 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp140_ = context;
+#line 968 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		cairo_set_source_rgba (_tmp140_, 0.25, 0.25, 0.25, 0.2);
+#line 969 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp141_ = context;
+#line 969 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		cairo_fill (_tmp141_);
+#line 972 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp142_ = context;
+#line 972 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp143_ = dx;
+#line 972 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp144_ = dy;
+#line 972 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp145_ = dw;
+#line 972 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp146_ = dh;
+#line 972 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		cairo_rectangle (_tmp142_, _tmp143_ - 1.5, _tmp144_ - 1.5, (gdouble) (_tmp145_ + 3), (gdouble) (_tmp146_ + 3));
+#line 973 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp147_ = context;
+#line 973 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		cairo_set_source_rgb (_tmp147_, 1.0, 1.0, 1.0);
+#line 974 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp148_ = context;
+#line 974 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		cairo_stroke (_tmp148_);
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp149_ = context;
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp150_ = dx;
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp151_ = dy;
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp152_ = dw;
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp153_ = dh;
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		cairo_rectangle (_tmp149_, _tmp150_ - 0.5, _tmp151_ - 0.5, (gdouble) (_tmp152_ + 1), (gdouble) (_tmp153_ + 1));
+#line 976 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp154_ = context;
+#line 976 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		cairo_set_source_rgb (_tmp154_, 0.0, 0.0, 0.0);
+#line 977 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp155_ = context;
+#line 977 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		cairo_stroke (_tmp155_);
+#line 6296 "page-view.c"
 	}
 }
 
@@ -3978,35 +6310,64 @@ void page_view_set_width (PageView* self, gint width) {
 	gboolean _tmp10_;
 	gint _tmp11_;
 	gint _tmp12_;
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = width;
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = self->priv->page;
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = page_get_height (_tmp1_);
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp3_ = self->priv->page;
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp4_ = page_get_width (_tmp3_);
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	height = (gint) ((((gdouble) _tmp0_) * _tmp2_) / _tmp4_);
+#line 985 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp6_ = self->priv->width;
+#line 985 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp7_ = width;
+#line 985 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp6_ == _tmp7_) {
+#line 6334 "page-view.c"
 		gint _tmp8_;
 		gint _tmp9_;
+#line 985 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp8_ = self->priv->height;
+#line 985 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp9_ = height;
+#line 985 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp5_ = _tmp8_ == _tmp9_;
+#line 6343 "page-view.c"
 	} else {
+#line 985 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp5_ = FALSE;
+#line 6347 "page-view.c"
 	}
+#line 985 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp10_ = _tmp5_;
+#line 985 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp10_) {
+#line 986 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return;
+#line 6355 "page-view.c"
 	}
+#line 988 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp11_ = width;
+#line 988 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->width = _tmp11_;
+#line 989 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp12_ = height;
+#line 989 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->height = _tmp12_;
+#line 992 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->update_image = TRUE;
+#line 994 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "size-changed");
+#line 995 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "changed");
+#line 6371 "page-view.c"
 }
 
 
@@ -4023,218 +6384,362 @@ void page_view_set_height (PageView* self, gint height) {
 	gboolean _tmp10_;
 	gint _tmp11_;
 	gint _tmp12_;
+#line 998 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
+#line 1001 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = height;
+#line 1001 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = self->priv->page;
+#line 1001 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = page_get_width (_tmp1_);
+#line 1001 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp3_ = self->priv->page;
+#line 1001 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp4_ = page_get_height (_tmp3_);
+#line 1001 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	width = (gint) ((((gdouble) _tmp0_) * _tmp2_) / _tmp4_);
+#line 1002 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp6_ = self->priv->width;
+#line 1002 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp7_ = width;
+#line 1002 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp6_ == _tmp7_) {
+#line 6408 "page-view.c"
 		gint _tmp8_;
 		gint _tmp9_;
+#line 1002 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp8_ = self->priv->height;
+#line 1002 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp9_ = height;
+#line 1002 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp5_ = _tmp8_ == _tmp9_;
+#line 6417 "page-view.c"
 	} else {
+#line 1002 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp5_ = FALSE;
+#line 6421 "page-view.c"
 	}
+#line 1002 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp10_ = _tmp5_;
+#line 1002 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp10_) {
+#line 1003 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return;
+#line 6429 "page-view.c"
 	}
+#line 1005 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp11_ = width;
+#line 1005 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->width = _tmp11_;
+#line 1006 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp12_ = height;
+#line 1006 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->height = _tmp12_;
+#line 1009 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->update_image = TRUE;
+#line 1011 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "size-changed");
+#line 1012 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "changed");
+#line 6445 "page-view.c"
 }
 
 
 gint page_view_get_width (PageView* self) {
 	gint result = 0;
 	gint _tmp0_;
+#line 1015 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, 0);
+#line 1017 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = self->priv->width;
+#line 1017 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	result = _tmp0_;
+#line 1017 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
+#line 6460 "page-view.c"
 }
 
 
 gint page_view_get_height (PageView* self) {
 	gint result = 0;
 	gint _tmp0_;
+#line 1020 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, 0);
+#line 1022 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = self->priv->height;
+#line 1022 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	result = _tmp0_;
+#line 1022 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
+#line 6475 "page-view.c"
 }
 
 
 static void page_view_page_pixels_changed_cb (PageView* self, Page* p) {
+#line 1025 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
+#line 1025 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (p != NULL);
+#line 1028 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->update_image = TRUE;
+#line 1029 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "changed");
+#line 6488 "page-view.c"
 }
 
 
 static void page_view_page_size_changed_cb (PageView* self, Page* p) {
+#line 1032 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
+#line 1032 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (p != NULL);
+#line 1035 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->update_image = TRUE;
+#line 1036 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "size-changed");
+#line 1037 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "changed");
+#line 6503 "page-view.c"
 }
 
 
 static void page_view_page_overlay_changed_cb (PageView* self, Page* p) {
+#line 1040 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
+#line 1040 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (p != NULL);
+#line 1042 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "changed");
+#line 6514 "page-view.c"
 }
 
 
 static void page_view_scan_direction_changed_cb (PageView* self, Page* p) {
+#line 1045 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
+#line 1045 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (p != NULL);
+#line 1048 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->update_image = TRUE;
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "size-changed");
+#line 1050 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "changed");
+#line 6529 "page-view.c"
 }
 
 
 static void value_page_view_init (GValue* value) {
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	value->data[0].v_pointer = NULL;
+#line 6536 "page-view.c"
 }
 
 
 static void value_page_view_free_value (GValue* value) {
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (value->data[0].v_pointer) {
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		page_view_unref (value->data[0].v_pointer);
+#line 6545 "page-view.c"
 	}
 }
 
 
 static void value_page_view_copy_value (const GValue* src_value, GValue* dest_value) {
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (src_value->data[0].v_pointer) {
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		dest_value->data[0].v_pointer = page_view_ref (src_value->data[0].v_pointer);
+#line 6555 "page-view.c"
 	} else {
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		dest_value->data[0].v_pointer = NULL;
+#line 6559 "page-view.c"
 	}
 }
 
 
 static gpointer value_page_view_peek_pointer (const GValue* value) {
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return value->data[0].v_pointer;
+#line 6567 "page-view.c"
 }
 
 
 static gchar* value_page_view_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (collect_values[0].v_pointer) {
+#line 6574 "page-view.c"
 		PageView* object;
 		object = collect_values[0].v_pointer;
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if (object->parent_instance.g_class == NULL) {
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+#line 6581 "page-view.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+#line 6585 "page-view.c"
 		}
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		value->data[0].v_pointer = page_view_ref (object);
+#line 6589 "page-view.c"
 	} else {
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		value->data[0].v_pointer = NULL;
+#line 6593 "page-view.c"
 	}
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return NULL;
+#line 6597 "page-view.c"
 }
 
 
 static gchar* value_page_view_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PageView** object_p;
 	object_p = collect_values[0].v_pointer;
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (!object_p) {
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
+#line 6608 "page-view.c"
 	}
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (!value->data[0].v_pointer) {
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		*object_p = NULL;
+#line 6614 "page-view.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		*object_p = value->data[0].v_pointer;
+#line 6618 "page-view.c"
 	} else {
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		*object_p = page_view_ref (value->data[0].v_pointer);
+#line 6622 "page-view.c"
 	}
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return NULL;
+#line 6626 "page-view.c"
 }
 
 
 GParamSpec* param_spec_page_view (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecPageView* spec;
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_PAGE_VIEW), NULL);
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return G_PARAM_SPEC (spec);
+#line 6640 "page-view.c"
 }
 
 
 gpointer value_get_page_view (const GValue* value) {
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PAGE_VIEW), NULL);
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return value->data[0].v_pointer;
+#line 6649 "page-view.c"
 }
 
 
 void value_set_page_view (GValue* value, gpointer v_object) {
 	PageView* old;
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PAGE_VIEW));
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	old = value->data[0].v_pointer;
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (v_object) {
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PAGE_VIEW));
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		value->data[0].v_pointer = v_object;
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		page_view_ref (value->data[0].v_pointer);
+#line 6669 "page-view.c"
 	} else {
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		value->data[0].v_pointer = NULL;
+#line 6673 "page-view.c"
 	}
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (old) {
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		page_view_unref (old);
+#line 6679 "page-view.c"
 	}
 }
 
 
 void value_take_page_view (GValue* value, gpointer v_object) {
 	PageView* old;
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PAGE_VIEW));
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	old = value->data[0].v_pointer;
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (v_object) {
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PAGE_VIEW));
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		value->data[0].v_pointer = v_object;
+#line 6698 "page-view.c"
 	} else {
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		value->data[0].v_pointer = NULL;
+#line 6702 "page-view.c"
 	}
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (old) {
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		page_view_unref (old);
+#line 6708 "page-view.c"
 	}
 }
 
 
 static void page_view_class_init (PageViewClass * klass) {
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	page_view_parent_class = g_type_class_peek_parent (klass);
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	PAGE_VIEW_CLASS (klass)->finalize = page_view_finalize;
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_type_class_add_private (klass, sizeof (PageViewPrivate));
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_new ("size_changed", TYPE_PAGE_VIEW, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_new ("changed", TYPE_PAGE_VIEW, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 6724 "page-view.c"
 }
 
 
 static void page_view_instance_init (PageView * self) {
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv = PAGE_VIEW_GET_PRIVATE (self);
+#line 32 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->image = NULL;
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->border_width = 1;
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->update_image = TRUE;
+#line 64 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->cursor = GDK_ARROW;
+#line 66 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->animate_n_segments = 7;
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->ref_count = 1;
+#line 6743 "page-view.c"
 }
 
 
@@ -4250,24 +6755,43 @@ static void page_view_finalize (PageView* obj) {
 	guint _tmp7_ = 0U;
 	Page* _tmp8_;
 	guint _tmp9_ = 0U;
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PAGE_VIEW, PageView);
+#line 85 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = self->priv->page;
+#line 85 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_parse_name ("pixels-changed", TYPE_PAGE, &_tmp1_, NULL, FALSE);
+#line 85 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _page_view_page_pixels_changed_cb_page_pixels_changed, self);
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = self->priv->page;
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_parse_name ("size-changed", TYPE_PAGE, &_tmp3_, NULL, FALSE);
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _page_view_page_size_changed_cb_page_size_changed, self);
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp4_ = self->priv->page;
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_parse_name ("crop-changed", TYPE_PAGE, &_tmp5_, NULL, FALSE);
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _page_view_page_overlay_changed_cb_page_crop_changed, self);
+#line 88 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp6_ = self->priv->page;
+#line 88 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_parse_name ("scan-line-changed", TYPE_PAGE, &_tmp7_, NULL, FALSE);
+#line 88 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _page_view_page_overlay_changed_cb_page_scan_line_changed, self);
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp8_ = self->priv->page;
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_parse_name ("scan-direction-changed", TYPE_PAGE, &_tmp9_, NULL, FALSE);
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp8_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _page_view_scan_direction_changed_cb_page_scan_direction_changed, self);
+#line 29 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_page_unref0 (self->priv->page);
+#line 32 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_g_object_unref0 (self->priv->image);
+#line 6795 "page-view.c"
 }
 
 
@@ -4288,17 +6812,24 @@ GType page_view_get_type (void) {
 gpointer page_view_ref (gpointer instance) {
 	PageView* self;
 	self = instance;
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_atomic_int_inc (&self->ref_count);
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return instance;
+#line 6820 "page-view.c"
 }
 
 
 void page_view_unref (gpointer instance) {
 	PageView* self;
 	self = instance;
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		PAGE_VIEW_GET_CLASS (self)->finalize (self);
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		g_type_free_instance ((GTypeInstance *) self);
+#line 6833 "page-view.c"
 	}
 }
 
diff --git a/src/page.c b/src/page.c
index a3c28d5..eee78d1 100644
--- a/src/page.c
+++ b/src/page.c
@@ -1,4 +1,4 @@
-/* page.c generated by valac 0.18.1, the Vala compiler
+/* page.c generated by valac 0.20.1, the Vala compiler
  * generated from page.vala, do not modify */
 
 /*
@@ -20,6 +20,8 @@
 #include <math.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <glib/gstdio.h>
+#include <gtk/gtk.h>
+#include <gdk/gdk.h>
 #include <gio/gio.h>
 #include <gobject/gvaluecollector.h>
 
@@ -239,11 +241,14 @@ gboolean page_has_crop (Page* self);
 void page_get_crop (Page* self, gint* x, gint* y, gint* width, gint* height);
 gchar* page_get_named_crop (Page* self);
 guchar* page_get_pixels (Page* self, int* result_length1);
+void page_set_pixels (Page* self, guchar* new_pixels, int new_pixels_length1);
+static guchar* _vala_array_dup3 (guchar* self, int length);
 static guchar page_get_sample (Page* self, guchar* pixels, int pixels_length1, gint offset, gint x, gint depth, gint n_channels, gint channel);
 static void page_get_pixel (Page* self, gint x, gint y, guchar* pixel, int pixel_length1, gint offset);
 GdkPixbuf* page_get_image (Page* self, gboolean apply_crop);
 static gchar* page_get_icc_data_encoded (Page* self, const gchar* icc_profile_filename);
-void page_save (Page* self, const gchar* type, GFile* file, GError** error);
+void page_copy_to_clipboard (Page* self, GtkWindow* window);
+void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError** error);
 PixbufWriter* pixbuf_writer_new (GFileOutputStream* stream);
 PixbufWriter* pixbuf_writer_construct (GType object_type, GFileOutputStream* stream);
 gpointer pixbuf_writer_ref (gpointer instance);
@@ -284,41 +289,70 @@ Page* page_construct (GType object_type, gint width, gint height, gint dpi, Scan
 	gboolean _tmp3_;
 	gint _tmp8_;
 	ScanDirection _tmp9_;
+#line 68 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self = (Page*) g_type_create_instance (object_type);
+#line 70 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = scan_direction;
+#line 70 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp1_ == SCAN_DIRECTION_TOP_TO_BOTTOM) {
+#line 70 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = TRUE;
+#line 301 "page.c"
 	} else {
 		ScanDirection _tmp2_;
+#line 70 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp2_ = scan_direction;
+#line 70 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = _tmp2_ == SCAN_DIRECTION_BOTTOM_TO_TOP;
+#line 308 "page.c"
 	}
+#line 70 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp3_ = _tmp0_;
+#line 70 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp3_) {
+#line 314 "page.c"
 		gint _tmp4_;
 		gint _tmp5_;
+#line 72 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp4_ = width;
+#line 72 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		self->priv->width = _tmp4_;
+#line 73 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp5_ = height;
+#line 73 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		self->priv->n_rows = _tmp5_;
+#line 325 "page.c"
 	} else {
 		gint _tmp6_;
 		gint _tmp7_;
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp6_ = height;
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		self->priv->width = _tmp6_;
+#line 78 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp7_ = width;
+#line 78 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		self->priv->n_rows = _tmp7_;
+#line 337 "page.c"
 	}
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp8_ = dpi;
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->dpi = _tmp8_;
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp9_ = scan_direction;
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->scan_direction = _tmp9_;
+#line 68 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return self;
+#line 349 "page.c"
 }
 
 
 Page* page_new (gint width, gint height, gint dpi, ScanDirection scan_direction) {
+#line 68 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return page_construct (TYPE_PAGE, width, height, dpi, scan_direction);
+#line 356 "page.c"
 }
 
 
@@ -345,117 +379,199 @@ void page_set_page_info (Page* self, ScanPageInfo* info) {
 	guchar* _tmp20_;
 	gint _tmp20__length1;
 	gint _tmp21_;
+#line 84 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
+#line 84 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (info != NULL);
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = info;
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = _tmp0_->height;
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->expected_rows = _tmp1_;
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp2_ = info;
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp3_ = _tmp2_->dpi;
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->dpi = (gint) _tmp3_;
+#line 90 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp4_ = info;
+#line 90 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp5_ = _tmp4_->width;
+#line 90 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->width = _tmp5_;
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp6_ = info;
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp7_ = _tmp6_->height;
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->n_rows = _tmp7_;
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp8_ = self->priv->n_rows;
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp8_ < 0) {
+#line 415 "page.c"
 		gint _tmp9_;
+#line 94 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp9_ = self->priv->width;
+#line 94 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		self->priv->n_rows = _tmp9_ / 2;
+#line 421 "page.c"
 	}
+#line 95 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp10_ = info;
+#line 95 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp11_ = _tmp10_->depth;
+#line 95 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->depth = _tmp11_;
+#line 96 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp12_ = info;
+#line 96 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp13_ = _tmp12_->n_channels;
+#line 96 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->n_channels = _tmp13_;
+#line 97 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp14_ = self->priv->width;
+#line 97 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp15_ = self->priv->depth;
+#line 97 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp16_ = self->priv->n_channels;
+#line 97 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->rowstride = (((_tmp14_ * _tmp15_) * _tmp16_) + 7) / 8;
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp17_ = self->priv->n_rows;
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp18_ = self->priv->rowstride;
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp19_ = _tmp17_ * _tmp18_;
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->pixels = g_renew (guchar, self->priv->pixels, _tmp17_ * _tmp18_);
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	(_tmp19_ > self->priv->pixels_length1) ? memset (self->priv->pixels + self->priv->pixels_length1, 0, sizeof (guchar) * (_tmp19_ - self->priv->pixels_length1)) : NULL;
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->pixels_length1 = _tmp19_;
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_pixels_size_ = _tmp19_;
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp20_ = self->priv->pixels;
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp20__length1 = self->priv->pixels_length1;
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (_tmp20_ != NULL);
+#line 102 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp21_ = self->priv->depth;
+#line 102 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp21_ == 1) {
+#line 467 "page.c"
 		guchar* _tmp22_;
 		gint _tmp22__length1;
 		gint _tmp23_;
 		gint _tmp24_;
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp22_ = self->priv->pixels;
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp22__length1 = self->priv->pixels_length1;
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp23_ = self->priv->n_rows;
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp24_ = self->priv->rowstride;
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		memset (_tmp22_, 0x00, (gsize) (_tmp23_ * _tmp24_));
+#line 482 "page.c"
 	} else {
 		guchar* _tmp25_;
 		gint _tmp25__length1;
 		gint _tmp26_;
 		gint _tmp27_;
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp25_ = self->priv->pixels;
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp25__length1 = self->priv->pixels_length1;
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp26_ = self->priv->n_rows;
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp27_ = self->priv->rowstride;
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		memset (_tmp25_, 0xFF, (gsize) (_tmp26_ * _tmp27_));
+#line 498 "page.c"
 	}
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "size-changed");
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "pixels-changed");
+#line 504 "page.c"
 }
 
 
 void page_start (Page* self) {
+#line 111 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->scanning = TRUE;
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "scan-line-changed");
+#line 515 "page.c"
 }
 
 
 gboolean page_is_scanning (Page* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_;
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
+#line 119 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->scanning;
+#line 119 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = _tmp0_;
+#line 119 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
+#line 530 "page.c"
 }
 
 
 gboolean page_has_data (Page* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_;
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->has_data_;
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = _tmp0_;
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
+#line 545 "page.c"
 }
 
 
 gboolean page_is_color (Page* self) {
 	gboolean result = FALSE;
 	gint _tmp0_;
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
+#line 129 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->n_channels;
+#line 129 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = _tmp0_ > 1;
+#line 129 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
+#line 560 "page.c"
 }
 
 
 gint page_get_scan_line (Page* self) {
 	gint result = 0;
 	gint _tmp0_;
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, 0);
+#line 134 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->scan_line;
+#line 134 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = _tmp0_;
+#line 134 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
+#line 575 "page.c"
 }
 
 
@@ -473,14 +589,23 @@ static void page_parse_line (Page* self, ScanLine* line, gint n, gboolean* size_
 	gint _tmp17_;
 	gint line_offset;
 	gint _tmp33_;
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (line != NULL);
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = line;
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = _tmp0_->number;
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp2_ = n;
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	line_number = _tmp1_ + _tmp2_;
+#line 144 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_vala_size_changed = FALSE;
+#line 145 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	while (TRUE) {
+#line 609 "page.c"
 		gint _tmp3_;
 		gint _tmp4_ = 0;
 		gint rows = 0;
@@ -492,42 +617,77 @@ static void page_parse_line (Page* self, ScanLine* line, gint n, gboolean* size_
 		gint _tmp10_;
 		gint _tmp11_;
 		gint _tmp12_ = 0;
+#line 145 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp3_ = line_number;
+#line 145 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp4_ = page_get_scan_height (self);
+#line 145 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (!(_tmp3_ >= _tmp4_)) {
+#line 145 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
+#line 629 "page.c"
 		}
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp5_ = self->priv->n_rows;
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		rows = _tmp5_;
+#line 151 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp6_ = rows;
+#line 151 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp7_ = self->priv->width;
+#line 151 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		self->priv->n_rows = _tmp6_ + (_tmp7_ / 2);
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp8_ = rows;
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp9_ = self->priv->n_rows;
-		g_debug ("page.vala:151: Extending image from %d lines to %d lines", _tmp8_, _tmp9_);
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		g_debug ("page.vala:152: Extending image from %d lines to %d lines", _tmp8_, _tmp9_);
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp10_ = self->priv->n_rows;
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp11_ = self->priv->rowstride;
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp12_ = _tmp10_ * _tmp11_;
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		self->priv->pixels = g_renew (guchar, self->priv->pixels, _tmp10_ * _tmp11_);
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		(_tmp12_ > self->priv->pixels_length1) ? memset (self->priv->pixels + self->priv->pixels_length1, 0, sizeof (guchar) * (_tmp12_ - self->priv->pixels_length1)) : NULL;
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		self->priv->pixels_length1 = _tmp12_;
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		self->priv->_pixels_size_ = _tmp12_;
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_vala_size_changed = TRUE;
+#line 663 "page.c"
 	}
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp13_ = line_number;
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp14_ = self->priv->rowstride;
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	offset = _tmp13_ * _tmp14_;
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp15_ = n;
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp16_ = line;
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp17_ = _tmp16_->data_length;
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	line_offset = _tmp15_ * _tmp17_;
+#line 679 "page.c"
 	{
 		gint i;
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		i = 0;
+#line 684 "page.c"
 		{
 			gboolean _tmp18_;
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp18_ = TRUE;
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			while (TRUE) {
+#line 691 "page.c"
 				gboolean _tmp19_;
 				gint _tmp21_;
 				ScanLine* _tmp22_;
@@ -543,38 +703,69 @@ static void page_parse_line (Page* self, ScanLine* line, gint n, gboolean* size_
 				gint _tmp30_;
 				guchar _tmp31_;
 				guchar _tmp32_;
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp19_ = _tmp18_;
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				if (!_tmp19_) {
+#line 711 "page.c"
 					gint _tmp20_;
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp20_ = i;
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					i = _tmp20_ + 1;
+#line 717 "page.c"
 				}
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp18_ = FALSE;
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp21_ = i;
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp22_ = line;
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp23_ = _tmp22_->data_length;
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				if (!(_tmp21_ < _tmp23_)) {
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					break;
+#line 731 "page.c"
 				}
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp24_ = self->priv->pixels;
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp24__length1 = self->priv->pixels_length1;
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp25_ = offset;
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp26_ = i;
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp27_ = line;
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp28_ = _tmp27_->data;
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp28__length1 = _tmp27_->data_length1;
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp29_ = line_offset;
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp30_ = i;
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp31_ = _tmp28_[_tmp29_ + _tmp30_];
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp24_[_tmp25_ + _tmp26_] = _tmp31_;
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp32_ = _tmp24_[_tmp25_ + _tmp26_];
+#line 757 "page.c"
 			}
 		}
 	}
+#line 164 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp33_ = line_number;
+#line 164 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->scan_line = _tmp33_;
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (size_changed) {
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*size_changed = _vala_size_changed;
+#line 769 "page.c"
 	}
 }
 
@@ -582,16 +773,25 @@ static void page_parse_line (Page* self, ScanLine* line, gint n, gboolean* size_
 void page_parse_scan_line (Page* self, ScanLine* line) {
 	gboolean size_has_changed;
 	gboolean _tmp9_;
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (line != NULL);
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	size_has_changed = FALSE;
+#line 783 "page.c"
 	{
 		gint i;
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		i = 0;
+#line 788 "page.c"
 		{
 			gboolean _tmp0_;
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp0_ = TRUE;
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			while (TRUE) {
+#line 795 "page.c"
 				gboolean _tmp1_;
 				gint _tmp3_;
 				ScanLine* _tmp4_;
@@ -599,33 +799,59 @@ void page_parse_scan_line (Page* self, ScanLine* line) {
 				ScanLine* _tmp6_;
 				gint _tmp7_;
 				gboolean _tmp8_ = FALSE;
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp1_ = _tmp0_;
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				if (!_tmp1_) {
+#line 807 "page.c"
 					gint _tmp2_;
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp2_ = i;
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					i = _tmp2_ + 1;
+#line 813 "page.c"
 				}
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp0_ = FALSE;
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp3_ = i;
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp4_ = line;
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp5_ = _tmp4_->n_lines;
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				if (!(_tmp3_ < _tmp5_)) {
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					break;
+#line 827 "page.c"
 				}
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp6_ = line;
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp7_ = i;
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				page_parse_line (self, _tmp6_, _tmp7_, &_tmp8_);
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				size_has_changed = _tmp8_;
+#line 837 "page.c"
 			}
 		}
 	}
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->has_data_ = TRUE;
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp9_ = size_has_changed;
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp9_) {
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_signal_emit_by_name (self, "size-changed");
+#line 849 "page.c"
 	}
+#line 177 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "scan-line-changed");
+#line 178 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "pixels-changed");
+#line 855 "page.c"
 }
 
 
@@ -635,20 +861,34 @@ void page_finish (Page* self) {
 	gint _tmp1_;
 	gboolean _tmp4_;
 	gboolean _tmp12_;
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
+#line 183 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	size_has_changed = FALSE;
+#line 186 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = self->priv->expected_rows;
+#line 186 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp1_ < 0) {
+#line 873 "page.c"
 		gint _tmp2_;
 		gint _tmp3_ = 0;
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp2_ = self->priv->scan_line;
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp3_ = page_get_scan_height (self);
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = _tmp2_ != _tmp3_;
+#line 882 "page.c"
 	} else {
+#line 186 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = FALSE;
+#line 886 "page.c"
 	}
+#line 186 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp4_ = _tmp0_;
+#line 186 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp4_) {
+#line 892 "page.c"
 		gint rows = 0;
 		gint _tmp5_;
 		gint _tmp6_;
@@ -657,38 +897,68 @@ void page_finish (Page* self) {
 		gint _tmp9_ = 0;
 		gint _tmp10_;
 		gint _tmp11_;
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp5_ = self->priv->n_rows;
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		rows = _tmp5_;
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp6_ = self->priv->scan_line;
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		self->priv->n_rows = _tmp6_;
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp7_ = self->priv->n_rows;
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp8_ = self->priv->rowstride;
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp9_ = _tmp7_ * _tmp8_;
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		self->priv->pixels = g_renew (guchar, self->priv->pixels, _tmp7_ * _tmp8_);
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		(_tmp9_ > self->priv->pixels_length1) ? memset (self->priv->pixels + self->priv->pixels_length1, 0, sizeof (guchar) * (_tmp9_ - self->priv->pixels_length1)) : NULL;
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		self->priv->pixels_length1 = _tmp9_;
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		self->priv->_pixels_size_ = _tmp9_;
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp10_ = rows;
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp11_ = self->priv->n_rows;
-		g_debug ("page.vala:193: Trimming page from %d lines to %d lines", _tmp10_, _tmp11_);
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		g_debug ("page.vala:194: Trimming page from %d lines to %d lines", _tmp10_, _tmp11_);
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		size_has_changed = TRUE;
+#line 931 "page.c"
 	}
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->scanning = FALSE;
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp12_ = size_has_changed;
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp12_) {
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_signal_emit_by_name (self, "size-changed");
+#line 941 "page.c"
 	}
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "scan-line-changed");
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_signal_emit_by_name (self, "scan-finished");
+#line 947 "page.c"
 }
 
 
 ScanDirection page_get_scan_direction (Page* self) {
 	ScanDirection result = 0;
 	ScanDirection _tmp0_;
+#line 206 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, 0);
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->scan_direction;
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = _tmp0_;
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
+#line 962 "page.c"
 }
 
 
@@ -710,36 +980,67 @@ static void page_set_scan_direction (Page* self, ScanDirection direction) {
 	ScanDirection _tmp33_;
 	gboolean _tmp34_;
 	gboolean _tmp35_;
+#line 211 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	size_has_changed = FALSE;
+#line 217 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->scan_direction;
+#line 217 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = direction;
+#line 217 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp0_ == _tmp1_) {
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return;
+#line 996 "page.c"
 	}
+#line 221 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp2_ = direction;
+#line 221 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp3_ = self->priv->scan_direction;
+#line 221 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	left_steps = (gint) (_tmp2_ - _tmp3_);
+#line 222 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp4_ = left_steps;
+#line 222 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp4_ < 0) {
+#line 1008 "page.c"
 		gint _tmp5_;
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp5_ = left_steps;
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		left_steps = _tmp5_ + 4;
+#line 1014 "page.c"
 	}
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp6_ = left_steps;
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp6_ != 2) {
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		size_has_changed = TRUE;
+#line 1022 "page.c"
 	}
+#line 227 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp7_ = page_get_width (self);
+#line 227 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	width = _tmp7_;
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp8_ = page_get_height (self);
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	height = _tmp8_;
+#line 231 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp9_ = self->priv->has_crop_;
+#line 231 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp9_) {
+#line 1036 "page.c"
 		gint _tmp10_;
+#line 233 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp10_ = left_steps;
+#line 233 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		switch (_tmp10_) {
+#line 233 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			case 1:
+#line 1044 "page.c"
 			{
 				gint _tmp11_;
 				gint _tmp12_;
@@ -749,23 +1050,41 @@ static void page_set_scan_direction (Page* self, ScanDirection direction) {
 				gint _tmp16_;
 				gint _tmp17_;
 				gint _tmp18_;
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp11_ = self->priv->crop_x;
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				t = _tmp11_;
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp12_ = self->priv->crop_y;
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				self->priv->crop_x = _tmp12_;
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp13_ = width;
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp14_ = t;
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp15_ = self->priv->crop_width;
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				self->priv->crop_y = _tmp13_ - (_tmp14_ + _tmp15_);
+#line 240 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp16_ = self->priv->crop_width;
+#line 240 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				t = _tmp16_;
+#line 241 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp17_ = self->priv->crop_height;
+#line 241 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				self->priv->crop_width = _tmp17_;
+#line 242 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp18_ = t;
+#line 242 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				self->priv->crop_height = _tmp18_;
+#line 243 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				break;
+#line 1084 "page.c"
 			}
+#line 233 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			case 2:
+#line 1088 "page.c"
 			{
 				gint _tmp19_;
 				gint _tmp20_;
@@ -773,17 +1092,29 @@ static void page_set_scan_direction (Page* self, ScanDirection direction) {
 				gint _tmp22_;
 				gint _tmp23_;
 				gint _tmp24_;
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp19_ = width;
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp20_ = self->priv->crop_x;
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp21_ = self->priv->crop_width;
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				self->priv->crop_x = _tmp19_ - (_tmp20_ + _tmp21_);
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp22_ = width;
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp23_ = self->priv->crop_y;
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp24_ = self->priv->crop_height;
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				self->priv->crop_y = _tmp22_ - (_tmp23_ + _tmp24_);
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				break;
+#line 1114 "page.c"
 			}
+#line 233 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			case 3:
+#line 1118 "page.c"
 			{
 				gint _tmp25_;
 				gint _tmp26_;
@@ -793,36 +1124,65 @@ static void page_set_scan_direction (Page* self, ScanDirection direction) {
 				gint _tmp30_;
 				gint _tmp31_;
 				gint _tmp32_;
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp25_ = self->priv->crop_y;
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				t = _tmp25_;
+#line 252 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp26_ = self->priv->crop_x;
+#line 252 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				self->priv->crop_y = _tmp26_;
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp27_ = height;
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp28_ = t;
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp29_ = self->priv->crop_height;
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				self->priv->crop_x = _tmp27_ - (_tmp28_ + _tmp29_);
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp30_ = self->priv->crop_width;
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				t = _tmp30_;
+#line 255 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp31_ = self->priv->crop_height;
+#line 255 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				self->priv->crop_width = _tmp31_;
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp32_ = t;
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				self->priv->crop_height = _tmp32_;
+#line 257 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				break;
+#line 1158 "page.c"
 			}
 			default:
+#line 233 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
+#line 1163 "page.c"
 		}
 	}
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp33_ = direction;
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->scan_direction = _tmp33_;
+#line 262 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp34_ = size_has_changed;
+#line 262 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp34_) {
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_signal_emit_by_name (self, "size-changed");
+#line 1176 "page.c"
 	}
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "scan-direction-changed");
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp35_ = self->priv->has_crop_;
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp35_) {
+#line 266 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_signal_emit_by_name (self, "crop-changed");
+#line 1186 "page.c"
 	}
 }
 
@@ -832,36 +1192,66 @@ void page_rotate_left (Page* self) {
 	ScanDirection direction;
 	ScanDirection _tmp1_;
 	ScanDirection _tmp2_;
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->scan_direction;
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	direction = _tmp0_;
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = direction;
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	switch (_tmp1_) {
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_TOP_TO_BOTTOM:
+#line 1208 "page.c"
 		{
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			direction = SCAN_DIRECTION_LEFT_TO_RIGHT;
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
+#line 1214 "page.c"
 		}
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_LEFT_TO_RIGHT:
+#line 1218 "page.c"
 		{
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			direction = SCAN_DIRECTION_BOTTOM_TO_TOP;
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
+#line 1224 "page.c"
 		}
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_BOTTOM_TO_TOP:
+#line 1228 "page.c"
 		{
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			direction = SCAN_DIRECTION_RIGHT_TO_LEFT;
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
+#line 1234 "page.c"
 		}
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_RIGHT_TO_LEFT:
+#line 1238 "page.c"
 		{
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			direction = SCAN_DIRECTION_TOP_TO_BOTTOM;
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
+#line 1244 "page.c"
 		}
 		default:
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		break;
+#line 1249 "page.c"
 	}
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp2_ = direction;
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_scan_direction (self, _tmp2_);
+#line 1255 "page.c"
 }
 
 
@@ -870,46 +1260,81 @@ void page_rotate_right (Page* self) {
 	ScanDirection direction;
 	ScanDirection _tmp1_;
 	ScanDirection _tmp2_;
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->scan_direction;
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	direction = _tmp0_;
+#line 293 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = direction;
+#line 293 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	switch (_tmp1_) {
+#line 293 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_TOP_TO_BOTTOM:
+#line 1276 "page.c"
 		{
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			direction = SCAN_DIRECTION_RIGHT_TO_LEFT;
+#line 297 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
+#line 1282 "page.c"
 		}
+#line 293 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_LEFT_TO_RIGHT:
+#line 1286 "page.c"
 		{
+#line 299 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			direction = SCAN_DIRECTION_TOP_TO_BOTTOM;
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
+#line 1292 "page.c"
 		}
+#line 293 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_BOTTOM_TO_TOP:
+#line 1296 "page.c"
 		{
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			direction = SCAN_DIRECTION_LEFT_TO_RIGHT;
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
+#line 1302 "page.c"
 		}
+#line 293 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_RIGHT_TO_LEFT:
+#line 1306 "page.c"
 		{
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			direction = SCAN_DIRECTION_BOTTOM_TO_TOP;
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
+#line 1312 "page.c"
 		}
 		default:
+#line 293 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		break;
+#line 1317 "page.c"
 	}
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp2_ = direction;
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_scan_direction (self, _tmp2_);
+#line 1323 "page.c"
 }
 
 
 gint page_get_dpi (Page* self) {
 	gint result = 0;
 	gint _tmp0_;
+#line 311 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, 0);
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->dpi;
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = _tmp0_;
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
+#line 1338 "page.c"
 }
 
 
@@ -917,11 +1342,17 @@ gboolean page_is_landscape (Page* self) {
 	gboolean result = FALSE;
 	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = page_get_width (self);
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = page_get_height (self);
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = _tmp0_ > _tmp1_;
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
+#line 1356 "page.c"
 }
 
 
@@ -930,26 +1361,45 @@ gint page_get_width (Page* self) {
 	gboolean _tmp0_ = FALSE;
 	ScanDirection _tmp1_;
 	gboolean _tmp3_;
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, 0);
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = self->priv->scan_direction;
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp1_ == SCAN_DIRECTION_TOP_TO_BOTTOM) {
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = TRUE;
+#line 1373 "page.c"
 	} else {
 		ScanDirection _tmp2_;
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp2_ = self->priv->scan_direction;
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = _tmp2_ == SCAN_DIRECTION_BOTTOM_TO_TOP;
+#line 1380 "page.c"
 	}
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp3_ = _tmp0_;
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp3_) {
+#line 1386 "page.c"
 		gint _tmp4_;
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp4_ = self->priv->width;
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		result = _tmp4_;
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return result;
+#line 1394 "page.c"
 	} else {
 		gint _tmp5_;
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp5_ = self->priv->n_rows;
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		result = _tmp5_;
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return result;
+#line 1403 "page.c"
 	}
 }
 
@@ -959,26 +1409,45 @@ gint page_get_height (Page* self) {
 	gboolean _tmp0_ = FALSE;
 	ScanDirection _tmp1_;
 	gboolean _tmp3_;
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, 0);
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = self->priv->scan_direction;
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp1_ == SCAN_DIRECTION_TOP_TO_BOTTOM) {
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = TRUE;
+#line 1421 "page.c"
 	} else {
 		ScanDirection _tmp2_;
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp2_ = self->priv->scan_direction;
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = _tmp2_ == SCAN_DIRECTION_BOTTOM_TO_TOP;
+#line 1428 "page.c"
 	}
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp3_ = _tmp0_;
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp3_) {
+#line 1434 "page.c"
 		gint _tmp4_;
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp4_ = self->priv->n_rows;
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		result = _tmp4_;
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return result;
+#line 1442 "page.c"
 	} else {
 		gint _tmp5_;
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp5_ = self->priv->width;
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		result = _tmp5_;
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return result;
+#line 1451 "page.c"
 	}
 }
 
@@ -986,61 +1455,92 @@ gint page_get_height (Page* self) {
 gint page_get_depth (Page* self) {
 	gint result = 0;
 	gint _tmp0_;
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, 0);
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->depth;
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = _tmp0_;
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
+#line 1467 "page.c"
 }
 
 
 gint page_get_n_channels (Page* self) {
 	gint result = 0;
 	gint _tmp0_;
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, 0);
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->n_channels;
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = _tmp0_;
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
+#line 1482 "page.c"
 }
 
 
 gint page_get_rowstride (Page* self) {
 	gint result = 0;
 	gint _tmp0_;
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, 0);
+#line 349 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->rowstride;
+#line 349 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = _tmp0_;
+#line 349 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
+#line 1497 "page.c"
 }
 
 
 gint page_get_scan_width (Page* self) {
 	gint result = 0;
 	gint _tmp0_;
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, 0);
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->width;
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = _tmp0_;
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
+#line 1512 "page.c"
 }
 
 
 gint page_get_scan_height (Page* self) {
 	gint result = 0;
 	gint _tmp0_;
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, 0);
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->n_rows;
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = _tmp0_;
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
+#line 1527 "page.c"
 }
 
 
 void page_set_color_profile (Page* self, const gchar* color_profile) {
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
+#line 364 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = color_profile;
+#line 364 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
+#line 364 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_free0 (self->priv->color_profile);
+#line 364 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->color_profile = _tmp1_;
+#line 1544 "page.c"
 }
 
 
@@ -1048,23 +1548,37 @@ gchar* page_get_color_profile (Page* self) {
 	gchar* result = NULL;
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, NULL);
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->color_profile;
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = _tmp1_;
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
+#line 1562 "page.c"
 }
 
 
 void page_set_no_crop (Page* self) {
 	gboolean _tmp0_;
+#line 372 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
+#line 374 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->has_crop_;
+#line 374 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (!_tmp0_) {
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return;
+#line 1576 "page.c"
 	}
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->has_crop_ = FALSE;
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "crop-changed");
+#line 1582 "page.c"
 }
 
 
@@ -1080,51 +1594,95 @@ void page_set_custom_crop (Page* self, gint width, gint height) {
 	gboolean _tmp13_;
 	gint _tmp14_;
 	gint _tmp15_;
+#line 380 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = width;
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (_tmp0_ >= 1);
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = height;
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (_tmp1_ >= 1);
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp5_ = self->priv->crop_name;
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp5_ == NULL) {
+#line 1612 "page.c"
 		gboolean _tmp6_;
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp6_ = self->priv->has_crop_;
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp4_ = _tmp6_;
+#line 1618 "page.c"
 	} else {
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp4_ = FALSE;
+#line 1622 "page.c"
 	}
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp7_ = _tmp4_;
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp7_) {
+#line 1628 "page.c"
 		gint _tmp8_;
 		gint _tmp9_;
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp8_ = self->priv->crop_width;
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp9_ = width;
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp3_ = _tmp8_ == _tmp9_;
+#line 1637 "page.c"
 	} else {
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp3_ = FALSE;
+#line 1641 "page.c"
 	}
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp10_ = _tmp3_;
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp10_) {
+#line 1647 "page.c"
 		gint _tmp11_;
 		gint _tmp12_;
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp11_ = self->priv->crop_height;
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp12_ = height;
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp2_ = _tmp11_ == _tmp12_;
+#line 1656 "page.c"
 	} else {
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp2_ = FALSE;
+#line 1660 "page.c"
 	}
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp13_ = _tmp2_;
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp13_) {
+#line 388 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return;
+#line 1668 "page.c"
 	}
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_free0 (self->priv->crop_name);
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->crop_name = NULL;
+#line 390 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->has_crop_ = TRUE;
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp14_ = width;
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->crop_width = _tmp14_;
+#line 393 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp15_ = height;
+#line 393 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->crop_height = _tmp15_;
+#line 406 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "crop-changed");
+#line 1686 "page.c"
 }
 
 
@@ -1134,12 +1692,19 @@ void page_set_named_crop (Page* self, const gchar* name) {
 	const gchar* _tmp0_;
 	const gchar* _tmp1_;
 	GQuark _tmp3_ = 0U;
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	static GQuark _tmp2_label0 = 0;
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	static GQuark _tmp2_label1 = 0;
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	static GQuark _tmp2_label2 = 0;
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	static GQuark _tmp2_label3 = 0;
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	static GQuark _tmp2_label4 = 0;
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	static GQuark _tmp2_label5 = 0;
+#line 1708 "page.c"
 	const gchar* _tmp5_;
 	gchar* _tmp6_;
 	gint _tmp7_ = 0;
@@ -1156,128 +1721,224 @@ void page_set_named_crop (Page* self, const gchar* name) {
 	gint _tmp19_;
 	gint _tmp22_;
 	gint _tmp23_;
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (name != NULL);
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = name;
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = _tmp0_;
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp3_ = (NULL == _tmp1_) ? 0 : g_quark_from_string (_tmp1_);
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp3_ == ((0 != _tmp2_label0) ? _tmp2_label0 : (_tmp2_label0 = g_quark_from_static_string ("A4")))) {
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		switch (0) {
+#line 1739 "page.c"
 			default:
 			{
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				width = 8.3;
+#line 416 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				height = 11.7;
+#line 417 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				break;
+#line 1748 "page.c"
 			}
 		}
 	} else if (_tmp3_ == ((0 != _tmp2_label1) ? _tmp2_label1 : (_tmp2_label1 = g_quark_from_static_string ("A5")))) {
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		switch (0) {
+#line 1754 "page.c"
 			default:
 			{
+#line 419 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				width = 5.8;
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				height = 8.3;
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				break;
+#line 1763 "page.c"
 			}
 		}
 	} else if (_tmp3_ == ((0 != _tmp2_label2) ? _tmp2_label2 : (_tmp2_label2 = g_quark_from_static_string ("A6")))) {
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		switch (0) {
+#line 1769 "page.c"
 			default:
 			{
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				width = 4.1;
+#line 424 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				height = 5.8;
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				break;
+#line 1778 "page.c"
 			}
 		}
 	} else if (_tmp3_ == ((0 != _tmp2_label3) ? _tmp2_label3 : (_tmp2_label3 = g_quark_from_static_string ("letter")))) {
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		switch (0) {
+#line 1784 "page.c"
 			default:
 			{
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				width = 8.5;
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				height = (gdouble) 11;
+#line 429 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				break;
+#line 1793 "page.c"
 			}
 		}
 	} else if (_tmp3_ == ((0 != _tmp2_label4) ? _tmp2_label4 : (_tmp2_label4 = g_quark_from_static_string ("legal")))) {
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		switch (0) {
+#line 1799 "page.c"
 			default:
 			{
+#line 431 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				width = 8.5;
+#line 432 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				height = (gdouble) 14;
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				break;
+#line 1808 "page.c"
 			}
 		}
 	} else if (_tmp3_ == ((0 != _tmp2_label5) ? _tmp2_label5 : (_tmp2_label5 = g_quark_from_static_string ("4x6")))) {
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		switch (0) {
+#line 1814 "page.c"
 			default:
 			{
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				width = (gdouble) 4;
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				height = (gdouble) 6;
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				break;
+#line 1823 "page.c"
 			}
 		}
 	} else {
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		switch (0) {
+#line 1829 "page.c"
 			default:
 			{
 				const gchar* _tmp4_;
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp4_ = name;
-				g_warning ("page.vala:437: Unknown paper size '%s'", _tmp4_);
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				g_warning ("page.vala:439: Unknown paper size '%s'", _tmp4_);
+#line 440 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				return;
+#line 1839 "page.c"
 			}
 		}
 	}
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp5_ = name;
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp6_ = g_strdup (_tmp5_);
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_free0 (self->priv->crop_name);
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->crop_name = _tmp6_;
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->has_crop_ = TRUE;
+#line 446 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp7_ = page_get_width (self);
+#line 446 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	pw = _tmp7_;
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp8_ = page_get_height (self);
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	ph = _tmp8_;
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp9_ = pw;
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp10_ = ph;
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp9_ > _tmp10_) {
+#line 1867 "page.c"
 		gdouble t = 0.0;
 		gdouble _tmp11_;
 		gdouble _tmp12_;
 		gdouble _tmp13_;
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp11_ = width;
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		t = _tmp11_;
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp12_ = height;
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		width = _tmp12_;
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp13_ = t;
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		height = _tmp13_;
+#line 1884 "page.c"
 	}
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp14_ = width;
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp15_ = self->priv->dpi;
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->crop_width = (gint) ((_tmp14_ * _tmp15_) + 0.5);
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp16_ = height;
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp17_ = self->priv->dpi;
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->crop_height = (gint) ((_tmp16_ * _tmp17_) + 0.5);
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp18_ = self->priv->crop_width;
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp19_ = pw;
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp18_ < _tmp19_) {
+#line 1904 "page.c"
 		gint _tmp20_;
 		gint _tmp21_;
+#line 463 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp20_ = pw;
+#line 463 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp21_ = self->priv->crop_width;
+#line 463 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		self->priv->crop_x = (_tmp20_ - _tmp21_) / 2;
+#line 1913 "page.c"
 	} else {
+#line 465 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		self->priv->crop_x = 0;
+#line 1917 "page.c"
 	}
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp22_ = self->priv->crop_height;
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp23_ = ph;
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp22_ < _tmp23_) {
+#line 1925 "page.c"
 		gint _tmp24_;
 		gint _tmp25_;
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp24_ = ph;
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp25_ = self->priv->crop_height;
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		self->priv->crop_y = (_tmp24_ - _tmp25_) / 2;
+#line 1934 "page.c"
 	} else {
+#line 469 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		self->priv->crop_y = 0;
+#line 1938 "page.c"
 	}
+#line 470 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "crop-changed");
+#line 1942 "page.c"
 }
 
 
@@ -1290,22 +1951,39 @@ void page_move_crop (Page* self, gint x, gint y) {
 	gint _tmp5_ = 0;
 	gint _tmp6_;
 	gint _tmp7_;
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = x;
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (_tmp0_ >= 0);
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = y;
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (_tmp1_ >= 0);
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp2_ = x;
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp3_ = page_get_width (self);
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (_tmp2_ < _tmp3_);
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp4_ = y;
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp5_ = page_get_height (self);
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (_tmp4_ < _tmp5_);
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp6_ = x;
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->crop_x = _tmp6_;
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp7_ = y;
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->crop_y = _tmp7_;
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "crop-changed");
+#line 1987 "page.c"
 }
 
 
@@ -1316,19 +1994,33 @@ void page_rotate_crop (Page* self) {
 	gint _tmp2_;
 	gint _tmp3_;
 	const gchar* _tmp4_;
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->has_crop_;
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (!_tmp0_) {
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return;
+#line 2006 "page.c"
 	}
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = self->priv->crop_width;
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	t = _tmp1_;
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp2_ = self->priv->crop_height;
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->crop_width = _tmp2_;
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp3_ = t;
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->crop_height = _tmp3_;
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp4_ = self->priv->crop_name;
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp4_ == NULL) {
+#line 2024 "page.c"
 		gint w = 0;
 		gint h = 0;
 		gint _tmp5_ = 0;
@@ -1341,56 +2033,99 @@ void page_rotate_crop (Page* self) {
 		gint _tmp15_;
 		gint _tmp16_;
 		gint _tmp19_;
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp5_ = page_get_width (self);
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		w = _tmp5_;
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp6_ = page_get_height (self);
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		h = _tmp6_;
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp7_ = self->priv->crop_x;
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp8_ = self->priv->crop_width;
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp9_ = w;
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if ((_tmp7_ + _tmp8_) > _tmp9_) {
+#line 2053 "page.c"
 			gint _tmp10_;
 			gint _tmp11_;
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp10_ = w;
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp11_ = self->priv->crop_width;
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			self->priv->crop_x = _tmp10_ - _tmp11_;
+#line 2062 "page.c"
 		}
+#line 506 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp12_ = self->priv->crop_x;
+#line 506 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (_tmp12_ < 0) {
+#line 2068 "page.c"
 			gint _tmp13_;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			self->priv->crop_x = 0;
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp13_ = w;
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			self->priv->crop_width = _tmp13_;
+#line 2076 "page.c"
 		}
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp14_ = self->priv->crop_y;
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp15_ = self->priv->crop_height;
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp16_ = h;
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if ((_tmp14_ + _tmp15_) > _tmp16_) {
+#line 2086 "page.c"
 			gint _tmp17_;
 			gint _tmp18_;
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp17_ = h;
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp18_ = self->priv->crop_height;
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			self->priv->crop_y = _tmp17_ - _tmp18_;
+#line 2095 "page.c"
 		}
+#line 513 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp19_ = self->priv->crop_y;
+#line 513 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (_tmp19_ < 0) {
+#line 2101 "page.c"
 			gint _tmp20_;
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			self->priv->crop_y = 0;
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp20_ = h;
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			self->priv->crop_height = _tmp20_;
+#line 2109 "page.c"
 		}
 	}
+#line 520 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "crop-changed");
+#line 2114 "page.c"
 }
 
 
 gboolean page_has_crop (Page* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_;
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->has_crop_;
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = _tmp0_;
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
+#line 2129 "page.c"
 }
 
 
@@ -1403,26 +2138,47 @@ void page_get_crop (Page* self, gint* x, gint* y, gint* width, gint* height) {
 	gint _tmp1_;
 	gint _tmp2_;
 	gint _tmp3_;
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->crop_x;
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_vala_x = _tmp0_;
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = self->priv->crop_y;
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_vala_y = _tmp1_;
+#line 532 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp2_ = self->priv->crop_width;
+#line 532 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_vala_width = _tmp2_;
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp3_ = self->priv->crop_height;
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_vala_height = _tmp3_;
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (x) {
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*x = _vala_x;
+#line 2164 "page.c"
 	}
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (y) {
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*y = _vala_y;
+#line 2170 "page.c"
 	}
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (width) {
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*width = _vala_width;
+#line 2176 "page.c"
 	}
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (height) {
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*height = _vala_height;
+#line 2182 "page.c"
 	}
 }
 
@@ -1431,11 +2187,17 @@ gchar* page_get_named_crop (Page* self) {
 	gchar* result = NULL;
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
+#line 536 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, NULL);
+#line 538 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->crop_name;
+#line 538 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
+#line 538 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = _tmp1_;
+#line 538 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
+#line 2201 "page.c"
 }
 
 
@@ -1445,24 +2207,83 @@ guchar* page_get_pixels (Page* self, int* result_length1) {
 	gint _tmp0__length1;
 	guchar* _tmp1_;
 	gint _tmp1__length1;
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, NULL);
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->pixels;
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0__length1 = self->priv->pixels_length1;
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = _tmp0_;
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1__length1 = _tmp0__length1;
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (result_length1) {
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*result_length1 = _tmp1__length1;
+#line 2225 "page.c"
 	}
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = _tmp1_;
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
+#line 2231 "page.c"
+}
+
+
+static guchar* _vala_array_dup3 (guchar* self, int length) {
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	return g_memdup (self, length * sizeof (guchar));
+#line 2238 "page.c"
+}
+
+
+void page_set_pixels (Page* self, guchar* new_pixels, int new_pixels_length1) {
+	guchar* _tmp0_;
+	gint _tmp0__length1;
+	guchar* _tmp1_;
+	gint _tmp1__length1;
+	guchar* _tmp2_;
+	gint _tmp2__length1;
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_if_fail (self != NULL);
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = new_pixels;
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0__length1 = new_pixels_length1;
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup3 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp1__length1 = _tmp0__length1;
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	self->priv->pixels = (g_free (self->priv->pixels), NULL);
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	self->priv->pixels = _tmp1_;
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	self->priv->pixels_length1 = _tmp1__length1;
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	self->priv->_pixels_size_ = self->priv->pixels_length1;
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp2_ = new_pixels;
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp2__length1 = new_pixels_length1;
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	self->priv->has_data_ = _tmp2_ != NULL;
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_signal_emit_by_name (self, "pixels-changed");
+#line 2275 "page.c"
 }
 
 
 static guchar page_get_sample (Page* self, guchar* pixels, int pixels_length1, gint offset, gint x, gint depth, gint n_channels, gint channel) {
 	guchar result = '\0';
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, '\0');
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = (guchar) 0xFF;
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
+#line 2287 "page.c"
 }
 
 
@@ -1511,79 +2332,138 @@ static void page_get_pixel (Page* self, gint x, gint y, guchar* pixel, int pixel
 	gint _tmp128_;
 	guchar _tmp129_ = '\0';
 	guchar _tmp130_;
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = page_get_scan_direction (self);
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	switch (_tmp0_) {
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_TOP_TO_BOTTOM:
+#line 2344 "page.c"
 		{
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
+#line 2348 "page.c"
 		}
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_BOTTOM_TO_TOP:
+#line 2352 "page.c"
 		{
 			gint _tmp1_ = 0;
 			gint _tmp2_;
 			gint _tmp3_ = 0;
 			gint _tmp4_;
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp1_ = page_get_scan_width (self);
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp2_ = x;
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			x = (_tmp1_ - _tmp2_) - 1;
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp3_ = page_get_scan_height (self);
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp4_ = y;
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			y = (_tmp3_ - _tmp4_) - 1;
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
+#line 2372 "page.c"
 		}
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_LEFT_TO_RIGHT:
+#line 2376 "page.c"
 		{
 			gint _tmp5_;
 			gint t;
 			gint _tmp6_ = 0;
 			gint _tmp7_;
 			gint _tmp8_;
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp5_ = x;
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			t = _tmp5_;
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp6_ = page_get_scan_width (self);
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp7_ = y;
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			x = (_tmp6_ - _tmp7_) - 1;
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp8_ = t;
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			y = _tmp8_;
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
+#line 2399 "page.c"
 		}
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_RIGHT_TO_LEFT:
+#line 2403 "page.c"
 		{
 			gint _tmp9_;
 			gint t;
 			gint _tmp10_;
 			gint _tmp11_ = 0;
 			gint _tmp12_;
+#line 577 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp9_ = x;
+#line 577 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			t = _tmp9_;
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp10_ = y;
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			x = _tmp10_;
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp11_ = page_get_scan_height (self);
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp12_ = t;
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			y = (_tmp11_ - _tmp12_) - 1;
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
+#line 2426 "page.c"
 		}
 		default:
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		break;
+#line 2431 "page.c"
 	}
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp13_ = page_get_depth (self);
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	depth = _tmp13_;
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp14_ = page_get_n_channels (self);
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	n_channels = _tmp14_;
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp15_ = page_get_rowstride (self);
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp16_ = y;
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	line_offset = _tmp15_ * _tmp16_;
+#line 588 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp18_ = depth;
+#line 588 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp18_ == 8) {
+#line 2451 "page.c"
 		gint _tmp19_;
+#line 588 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp19_ = n_channels;
+#line 588 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp17_ = _tmp19_ == 3;
+#line 2457 "page.c"
 	} else {
+#line 588 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp17_ = FALSE;
+#line 2461 "page.c"
 	}
+#line 588 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp20_ = _tmp17_;
+#line 588 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp20_) {
+#line 2467 "page.c"
 		gint _tmp21_;
 		gint _tmp22_;
 		gint _tmp23_;
@@ -1612,52 +2492,96 @@ static void page_get_pixel (Page* self, gint x, gint y, guchar* pixel, int pixel
 		gint _tmp39_;
 		guchar _tmp40_;
 		guchar _tmp41_;
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp21_ = line_offset;
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp22_ = x;
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp23_ = n_channels;
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		o = _tmp21_ + (_tmp22_ * _tmp23_);
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp24_ = pixel;
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp24__length1 = pixel_length1;
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp25_ = offset;
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp26_ = self->priv->pixels;
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp26__length1 = self->priv->pixels_length1;
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp27_ = o;
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp28_ = _tmp26_[_tmp27_];
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp24_[_tmp25_ + 0] = _tmp28_;
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp29_ = _tmp24_[_tmp25_ + 0];
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp30_ = pixel;
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp30__length1 = pixel_length1;
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp31_ = offset;
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp32_ = self->priv->pixels;
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp32__length1 = self->priv->pixels_length1;
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp33_ = o;
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp34_ = _tmp32_[_tmp33_ + 1];
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp30_[_tmp31_ + 1] = _tmp34_;
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp35_ = _tmp30_[_tmp31_ + 1];
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp36_ = pixel;
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp36__length1 = pixel_length1;
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp37_ = offset;
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp38_ = self->priv->pixels;
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp38__length1 = self->priv->pixels_length1;
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp39_ = o;
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp40_ = _tmp38_[_tmp39_ + 2];
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp36_[_tmp37_ + 2] = _tmp40_;
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp41_ = _tmp36_[_tmp37_ + 2];
+#line 594 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return;
+#line 2560 "page.c"
 	} else {
 		gboolean _tmp42_ = FALSE;
 		gint _tmp43_;
 		gboolean _tmp45_;
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp43_ = depth;
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (_tmp43_ == 8) {
+#line 2569 "page.c"
 			gint _tmp44_;
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp44_ = n_channels;
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp42_ = _tmp44_ == 1;
+#line 2575 "page.c"
 		} else {
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp42_ = FALSE;
+#line 2579 "page.c"
 		}
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp45_ = _tmp42_;
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (_tmp45_) {
+#line 2585 "page.c"
 			guchar* _tmp46_;
 			gint _tmp46__length1;
 			gint _tmp47_;
@@ -1677,43 +2601,78 @@ static void page_get_pixel (Page* self, gint x, gint y, guchar* pixel, int pixel
 			guchar _tmp57_;
 			guchar _tmp58_;
 			guchar _tmp59_;
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp46_ = self->priv->pixels;
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp46__length1 = self->priv->pixels_length1;
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp47_ = line_offset;
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp48_ = x;
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp49_ = _tmp46_[_tmp47_ + _tmp48_];
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			p = _tmp49_;
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp50_ = pixel;
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp50__length1 = pixel_length1;
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp51_ = offset;
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp52_ = pixel;
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp52__length1 = pixel_length1;
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp53_ = offset;
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp54_ = pixel;
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp54__length1 = pixel_length1;
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp55_ = offset;
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp56_ = p;
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp54_[_tmp55_ + 2] = _tmp56_;
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp57_ = _tmp54_[_tmp55_ + 2];
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp52_[_tmp53_ + 1] = _tmp57_;
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp58_ = _tmp52_[_tmp53_ + 1];
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp50_[_tmp51_ + 0] = _tmp58_;
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp59_ = _tmp50_[_tmp51_ + 0];
+#line 600 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			return;
+#line 2651 "page.c"
 		} else {
 			gboolean _tmp60_ = FALSE;
 			gint _tmp61_;
 			gboolean _tmp63_;
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp61_ = depth;
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			if (_tmp61_ == 1) {
+#line 2660 "page.c"
 				gint _tmp62_;
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp62_ = n_channels;
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp60_ = _tmp62_ == 1;
+#line 2666 "page.c"
 			} else {
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp60_ = FALSE;
+#line 2670 "page.c"
 			}
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp63_ = _tmp60_;
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			if (_tmp63_) {
+#line 2676 "page.c"
 				guchar* _tmp64_;
 				gint _tmp64__length1;
 				gint _tmp65_;
@@ -1736,50 +2695,92 @@ static void page_get_pixel (Page* self, gint x, gint y, guchar* pixel, int pixel
 				guchar _tmp78_;
 				guchar _tmp79_;
 				guchar _tmp80_;
+#line 606 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp64_ = self->priv->pixels;
+#line 606 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp64__length1 = self->priv->pixels_length1;
+#line 606 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp65_ = line_offset;
+#line 606 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp66_ = x;
+#line 606 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp67_ = _tmp64_[_tmp65_ + (_tmp66_ / 8)];
+#line 606 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				p = _tmp67_;
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp69_ = p;
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp70_ = x;
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				if (((gint) (_tmp69_ & (0x80 >> (_tmp70_ % 8)))) != 0) {
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp68_ = 0x00;
+#line 2719 "page.c"
 				} else {
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp68_ = 0xFF;
+#line 2723 "page.c"
 				}
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp71_ = pixel;
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp71__length1 = pixel_length1;
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp72_ = offset;
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp73_ = pixel;
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp73__length1 = pixel_length1;
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp74_ = offset;
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp75_ = pixel;
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp75__length1 = pixel_length1;
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp76_ = offset;
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp77_ = _tmp68_;
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp75_[_tmp76_ + 2] = (guchar) _tmp77_;
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp78_ = _tmp75_[_tmp76_ + 2];
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp73_[_tmp74_ + 1] = _tmp78_;
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp79_ = _tmp73_[_tmp74_ + 1];
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp71_[_tmp72_ + 0] = _tmp79_;
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp80_ = _tmp71_[_tmp72_ + 0];
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				return;
+#line 2759 "page.c"
 			} else {
 				gboolean _tmp81_ = FALSE;
 				gint _tmp82_;
 				gboolean _tmp84_;
+#line 612 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp82_ = depth;
+#line 612 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				if (_tmp82_ == 2) {
+#line 2768 "page.c"
 					gint _tmp83_;
+#line 612 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp83_ = n_channels;
+#line 612 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp81_ = _tmp83_ == 1;
+#line 2774 "page.c"
 				} else {
+#line 612 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp81_ = FALSE;
+#line 2778 "page.c"
 				}
+#line 612 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp84_ = _tmp81_;
+#line 612 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				if (_tmp84_) {
+#line 2784 "page.c"
 					gint _tmp85_[4] = {0};
 					gint block_shift[4];
 					guchar* _tmp86_;
@@ -1806,80 +2807,152 @@ static void page_get_pixel (Page* self, gint x, gint y, guchar* pixel, int pixel
 					guchar _tmp101_;
 					guchar _tmp102_;
 					guchar _tmp103_;
+#line 614 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp85_[0] = 6;
+#line 614 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp85_[1] = 4;
+#line 614 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp85_[2] = 2;
+#line 614 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp85_[3] = 0;
+#line 614 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					memcpy (block_shift, _tmp85_, 4 * sizeof (gint));
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp86_ = self->priv->pixels;
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp86__length1 = self->priv->pixels_length1;
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp87_ = line_offset;
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp88_ = x;
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp89_ = _tmp86_[_tmp87_ + (_tmp88_ / 4)];
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					p = _tmp89_;
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp90_ = p;
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp91_ = x;
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp92_ = block_shift[_tmp91_ % 4];
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					sample = (_tmp90_ >> _tmp92_) & 0x3;
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp93_ = sample;
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					sample = (_tmp93_ * 255) / 3;
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp94_ = pixel;
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp94__length1 = pixel_length1;
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp95_ = offset;
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp96_ = pixel;
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp96__length1 = pixel_length1;
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp97_ = offset;
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp98_ = pixel;
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp98__length1 = pixel_length1;
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp99_ = offset;
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp100_ = sample;
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp98_[_tmp99_ + 2] = (guchar) _tmp100_;
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp101_ = _tmp98_[_tmp99_ + 2];
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp96_[_tmp97_ + 1] = _tmp101_;
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp102_ = _tmp96_[_tmp97_ + 1];
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp94_[_tmp95_ + 0] = _tmp102_;
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp103_ = _tmp94_[_tmp95_ + 0];
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					return;
+#line 2879 "page.c"
 				}
 			}
 		}
 	}
+#line 625 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp104_ = pixel;
+#line 625 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp104__length1 = pixel_length1;
+#line 625 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp105_ = offset;
+#line 625 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp106_ = self->priv->pixels;
+#line 625 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp106__length1 = self->priv->pixels_length1;
+#line 625 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp107_ = line_offset;
+#line 625 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp108_ = x;
+#line 625 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp109_ = depth;
+#line 625 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp110_ = n_channels;
+#line 625 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp111_ = page_get_sample (self, _tmp106_, _tmp106__length1, _tmp107_, _tmp108_, _tmp109_, _tmp110_, 0);
+#line 625 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp104_[_tmp105_ + 0] = _tmp111_;
+#line 625 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp112_ = _tmp104_[_tmp105_ + 0];
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp113_ = pixel;
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp113__length1 = pixel_length1;
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp114_ = offset;
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp115_ = self->priv->pixels;
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp115__length1 = self->priv->pixels_length1;
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp116_ = line_offset;
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp117_ = x;
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp118_ = depth;
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp119_ = n_channels;
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp120_ = page_get_sample (self, _tmp115_, _tmp115__length1, _tmp116_, _tmp117_, _tmp118_, _tmp119_, 1);
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp113_[_tmp114_ + 1] = _tmp120_;
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp121_ = _tmp113_[_tmp114_ + 1];
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp122_ = pixel;
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp122__length1 = pixel_length1;
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp123_ = offset;
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp124_ = self->priv->pixels;
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp124__length1 = self->priv->pixels_length1;
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp125_ = line_offset;
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp126_ = x;
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp127_ = depth;
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp128_ = n_channels;
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp129_ = page_get_sample (self, _tmp124_, _tmp124__length1, _tmp125_, _tmp126_, _tmp127_, _tmp128_, 2);
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp122_[_tmp123_ + 2] = _tmp129_;
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp130_ = _tmp122_[_tmp123_ + 2];
+#line 2956 "page.c"
 }
 
 
@@ -1903,17 +2976,29 @@ GdkPixbuf* page_get_image (Page* self, gboolean apply_crop) {
 	guint8* image_pixels;
 	gint image_pixels_length1;
 	gint _image_pixels_size_;
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, NULL);
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = apply_crop;
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp1_) {
+#line 2986 "page.c"
 		gboolean _tmp2_;
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp2_ = self->priv->has_crop_;
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = _tmp2_;
+#line 2992 "page.c"
 	} else {
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = FALSE;
+#line 2996 "page.c"
 	}
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp3_ = _tmp0_;
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp3_) {
+#line 3002 "page.c"
 		gint _tmp4_;
 		gint _tmp5_;
 		gint _tmp6_;
@@ -1926,68 +3011,125 @@ GdkPixbuf* page_get_image (Page* self, gboolean apply_crop) {
 		gint _tmp14_;
 		gint _tmp15_;
 		gint _tmp16_ = 0;
+#line 635 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp4_ = self->priv->crop_x;
+#line 635 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		l = _tmp4_;
+#line 636 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp5_ = l;
+#line 636 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp6_ = self->priv->crop_width;
+#line 636 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		r = _tmp5_ + _tmp6_;
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp7_ = self->priv->crop_y;
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		t = _tmp7_;
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp8_ = t;
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp9_ = self->priv->crop_height;
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		b = _tmp8_ + _tmp9_;
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp10_ = l;
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (_tmp10_ < 0) {
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			l = 0;
+#line 3041 "page.c"
 		}
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp11_ = r;
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp12_ = page_get_width (self);
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (_tmp11_ > _tmp12_) {
+#line 3049 "page.c"
 			gint _tmp13_ = 0;
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp13_ = page_get_width (self);
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			r = _tmp13_;
+#line 3055 "page.c"
 		}
+#line 644 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp14_ = t;
+#line 644 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (_tmp14_ < 0) {
+#line 645 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			t = 0;
+#line 3063 "page.c"
 		}
+#line 646 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp15_ = b;
+#line 646 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp16_ = page_get_height (self);
+#line 646 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (_tmp15_ > _tmp16_) {
+#line 3071 "page.c"
 			gint _tmp17_ = 0;
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp17_ = page_get_height (self);
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			b = _tmp17_;
+#line 3077 "page.c"
 		}
 	} else {
 		gint _tmp18_ = 0;
 		gint _tmp19_ = 0;
+#line 651 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		l = 0;
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp18_ = page_get_width (self);
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		r = _tmp18_;
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		t = 0;
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp19_ = page_get_height (self);
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		b = _tmp19_;
+#line 3094 "page.c"
 	}
+#line 657 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp20_ = r;
+#line 657 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp21_ = l;
+#line 657 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp22_ = b;
+#line 657 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp23_ = t;
+#line 657 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp24_ = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, _tmp20_ - _tmp21_, _tmp22_ - _tmp23_);
+#line 657 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	image = _tmp24_;
+#line 658 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp25_ = image;
+#line 658 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp26_ = gdk_pixbuf_get_pixels (_tmp25_);
+#line 658 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	image_pixels = _tmp26_;
+#line 658 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	image_pixels_length1 = -1;
+#line 658 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_image_pixels_size_ = image_pixels_length1;
+#line 3118 "page.c"
 	{
 		gint _tmp27_;
 		gint y;
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp27_ = t;
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		y = _tmp27_;
+#line 3126 "page.c"
 		{
 			gboolean _tmp28_;
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp28_ = TRUE;
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			while (TRUE) {
+#line 3133 "page.c"
 				gboolean _tmp29_;
 				gint _tmp31_;
 				gint _tmp32_;
@@ -1996,32 +3138,56 @@ GdkPixbuf* page_get_image (Page* self, gboolean apply_crop) {
 				gint _tmp35_;
 				gint _tmp36_;
 				gint offset;
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp29_ = _tmp28_;
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				if (!_tmp29_) {
+#line 3146 "page.c"
 					gint _tmp30_;
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp30_ = y;
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					y = _tmp30_ + 1;
+#line 3152 "page.c"
 				}
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp28_ = FALSE;
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp31_ = y;
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp32_ = b;
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				if (!(_tmp31_ < _tmp32_)) {
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					break;
+#line 3164 "page.c"
 				}
+#line 661 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp33_ = image;
+#line 661 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp34_ = gdk_pixbuf_get_rowstride (_tmp33_);
+#line 661 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp35_ = y;
+#line 661 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp36_ = t;
+#line 661 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				offset = _tmp34_ * (_tmp35_ - _tmp36_);
+#line 3176 "page.c"
 				{
 					gint _tmp37_;
 					gint x;
+#line 662 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp37_ = l;
+#line 662 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					x = _tmp37_;
+#line 3184 "page.c"
 					{
 						gboolean _tmp38_;
+#line 662 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 						_tmp38_ = TRUE;
+#line 662 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 						while (TRUE) {
+#line 3191 "page.c"
 							gboolean _tmp39_;
 							gint _tmp41_;
 							gint _tmp42_;
@@ -2032,34 +3198,58 @@ GdkPixbuf* page_get_image (Page* self, gboolean apply_crop) {
 							gint _tmp46_;
 							gint _tmp47_;
 							gint _tmp48_;
+#line 662 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 							_tmp39_ = _tmp38_;
+#line 662 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 							if (!_tmp39_) {
+#line 3206 "page.c"
 								gint _tmp40_;
+#line 662 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 								_tmp40_ = x;
+#line 662 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 								x = _tmp40_ + 1;
+#line 3212 "page.c"
 							}
+#line 662 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 							_tmp38_ = FALSE;
+#line 662 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 							_tmp41_ = x;
+#line 662 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 							_tmp42_ = r;
+#line 662 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 							if (!(_tmp41_ < _tmp42_)) {
+#line 662 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 								break;
+#line 3224 "page.c"
 							}
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 							_tmp43_ = x;
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 							_tmp44_ = y;
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 							_tmp45_ = image_pixels;
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 							_tmp45__length1 = image_pixels_length1;
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 							_tmp46_ = offset;
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 							_tmp47_ = x;
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 							_tmp48_ = l;
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 							page_get_pixel (self, _tmp43_, _tmp44_, _tmp45_, _tmp45__length1, _tmp46_ + ((_tmp47_ - _tmp48_) * 3));
+#line 3242 "page.c"
 						}
 					}
 				}
 			}
 		}
 	}
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = image;
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
+#line 3253 "page.c"
 }
 
 
@@ -2078,27 +3268,49 @@ static gchar* string_to_utf8 (const gchar* self, int* result_length1) {
 	gint _tmp6_;
 	gchar* _tmp7_;
 	gint _tmp7__length1;
+#line 1267 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
+#line 1268 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
+#line 1268 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
+#line 1268 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp2_ = g_new0 (gchar, _tmp1_ + 1);
+#line 1268 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
+#line 1268 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_result__length1 = _tmp1_ + 1;
+#line 1268 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	__result__size_ = _result__length1;
+#line 1269 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp3_ = _result__length1;
+#line 1269 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_result__length1 = _tmp3_ - 1;
+#line 1270 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp4_ = _result_;
+#line 1270 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp4__length1 = _result__length1;
+#line 1270 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp5_ = strlen (self);
+#line 1270 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp6_ = _tmp5_;
+#line 1270 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	memcpy (_tmp4_, self, (gsize) _tmp6_);
+#line 1271 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp7_ = _result_;
+#line 1271 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp7__length1 = _result__length1;
+#line 1271 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	if (result_length1) {
+#line 1271 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp7__length1;
+#line 3308 "page.c"
 	}
+#line 1271 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	result = _tmp7_;
+#line 1271 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	return result;
+#line 3314 "page.c"
 }
 
 
@@ -2113,56 +3325,143 @@ static gchar* page_get_icc_data_encoded (Page* self, const gchar* icc_profile_fi
 	gchar* _tmp8_ = NULL;
 	gchar* _tmp9_;
 	GError * _inner_error_ = NULL;
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, NULL);
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (icc_profile_filename != NULL, NULL);
+#line 3333 "page.c"
 	{
 		const gchar* _tmp0_;
 		gchar* _tmp1_ = NULL;
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = icc_profile_filename;
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_file_get_contents (_tmp0_, &_tmp1_, NULL, &_inner_error_);
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_g_free0 (contents);
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		contents = _tmp1_;
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (_inner_error_ != NULL) {
-			goto __catch2_g_error;
+#line 3347 "page.c"
+			goto __catch3_g_error;
 		}
 	}
-	goto __finally2;
-	__catch2_g_error:
+	goto __finally3;
+	__catch3_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp2_;
 		const gchar* _tmp3_;
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		e = _inner_error_;
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_inner_error_ = NULL;
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp2_ = e;
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp3_ = _tmp2_->message;
-		g_warning ("page.vala:670: failed to get icc profile data: %s", _tmp3_);
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		g_warning ("page.vala:679: failed to get icc profile data: %s", _tmp3_);
+#line 680 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		result = NULL;
+#line 680 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_g_error_free0 (e);
+#line 680 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_g_free0 (contents);
+#line 680 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return result;
+#line 3375 "page.c"
 	}
-	__finally2:
+	__finally3:
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_inner_error_ != NULL) {
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_g_free0 (contents);
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_clear_error (&_inner_error_);
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return NULL;
+#line 3388 "page.c"
 	}
+#line 684 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp4_ = contents;
+#line 684 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp6_ = string_to_utf8 (_tmp4_, &_tmp5_);
+#line 684 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp7_ = (guchar*) _tmp6_;
+#line 684 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp7__length1 = (_tmp5_ * sizeof (gchar)) / sizeof (guchar);
+#line 684 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp8_ = g_base64_encode (_tmp7_, (_tmp5_ * sizeof (gchar)) / sizeof (guchar));
+#line 684 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp9_ = _tmp8_;
+#line 684 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp7_ = (g_free (_tmp7_), NULL);
+#line 684 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = _tmp9_;
+#line 684 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_free0 (contents);
+#line 684 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
+#line 3410 "page.c"
+}
+
+
+static gpointer _g_object_ref0 (gpointer self) {
+#line 689 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	return self ? g_object_ref (self) : NULL;
+#line 3417 "page.c"
 }
 
 
-void page_save (Page* self, const gchar* type, GFile* file, GError** error) {
+void page_copy_to_clipboard (Page* self, GtkWindow* window) {
+	GtkWindow* _tmp0_;
+	GdkDisplay* _tmp1_ = NULL;
+	GdkDisplay* _tmp2_;
+	GdkDisplay* display;
+	GtkClipboard* _tmp3_ = NULL;
+	GtkClipboard* _tmp4_;
+	GtkClipboard* clipboard;
+	GdkPixbuf* _tmp5_ = NULL;
+	GdkPixbuf* image;
+#line 687 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_if_fail (self != NULL);
+#line 687 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_return_if_fail (window != NULL);
+#line 689 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp0_ = window;
+#line 689 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp1_ = gtk_widget_get_display ((GtkWidget*) _tmp0_);
+#line 689 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp2_ = _g_object_ref0 (_tmp1_);
+#line 689 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	display = _tmp2_;
+#line 690 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp3_ = gtk_clipboard_get_for_display (display, GDK_SELECTION_CLIPBOARD);
+#line 690 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp4_ = _g_object_ref0 (_tmp3_);
+#line 690 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	clipboard = _tmp4_;
+#line 691 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_tmp5_ = page_get_image (self, TRUE);
+#line 691 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	image = _tmp5_;
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	gtk_clipboard_set_image (clipboard, image);
+#line 687 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_g_object_unref0 (image);
+#line 687 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_g_object_unref0 (clipboard);
+#line 687 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	_g_object_unref0 (display);
+#line 3461 "page.c"
+}
+
+
+void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError** error) {
 	GFile* _tmp0_;
 	GFileOutputStream* _tmp1_ = NULL;
 	GFileOutputStream* stream;
@@ -2177,378 +3476,711 @@ void page_save (Page* self, const gchar* type, GFile* file, GError** error) {
 	const gchar* _tmp9_;
 	gint _tmp10_ = 0;
 	GError * _inner_error_ = NULL;
+#line 695 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
+#line 695 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (type != NULL);
+#line 695 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (file != NULL);
+#line 697 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = file;
+#line 697 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = g_file_replace (_tmp0_, NULL, FALSE, G_FILE_CREATE_NONE, NULL, &_inner_error_);
+#line 697 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	stream = _tmp1_;
+#line 697 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_inner_error_ != NULL) {
+#line 697 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_propagate_error (error, _inner_error_);
+#line 697 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return;
+#line 3498 "page.c"
 	}
+#line 698 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp2_ = stream;
+#line 698 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp3_ = pixbuf_writer_new (_tmp2_);
+#line 698 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	writer = _tmp3_;
+#line 699 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp4_ = page_get_image (self, TRUE);
+#line 699 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	image = _tmp4_;
+#line 701 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	icc_profile_data = NULL;
+#line 702 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp5_ = self->priv->color_profile;
+#line 702 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp5_ != NULL) {
+#line 3516 "page.c"
 		const gchar* _tmp6_;
 		gchar* _tmp7_ = NULL;
+#line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp6_ = self->priv->color_profile;
+#line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp7_ = page_get_icc_data_encoded (self, _tmp6_);
+#line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_g_free0 (icc_profile_data);
+#line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		icc_profile_data = _tmp7_;
+#line 3527 "page.c"
 	}
+#line 705 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp8_ = g_strcmp0;
+#line 705 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp9_ = type;
+#line 705 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp10_ = _tmp8_ (_tmp9_, "jpeg");
+#line 705 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp10_ == 0) {
+#line 3537 "page.c"
 		gchar* _tmp11_;
-		gchar** _tmp12_ = NULL;
+		gchar* _tmp12_;
+		gchar* _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
+		gchar** _tmp16_ = NULL;
 		gchar** keys;
 		gint keys_length1;
 		gint _keys_size_;
-		gchar* _tmp13_;
-		gchar** _tmp14_ = NULL;
+		gint _tmp17_;
+		gchar* _tmp18_ = NULL;
+		gchar* _tmp19_;
+		gint _tmp20_;
+		gchar* _tmp21_ = NULL;
+		gint _tmp22_;
+		gchar* _tmp23_ = NULL;
+		const gchar* _tmp24_;
+		gchar* _tmp25_;
+		gchar** _tmp26_ = NULL;
 		gchar** values;
 		gint values_length1;
 		gint _values_size_;
-		PixbufWriter* _tmp15_;
-		GdkPixbuf* _tmp16_;
-		gchar** _tmp17_;
-		gint _tmp17__length1;
-		gchar** _tmp18_;
-		gint _tmp18__length1;
+		const gchar* _tmp27_;
+		PixbufWriter* _tmp30_;
+		GdkPixbuf* _tmp31_;
+		gchar** _tmp32_;
+		gint _tmp32__length1;
+		gchar** _tmp33_;
+		gint _tmp33__length1;
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp11_ = g_strdup ("quality");
-		_tmp12_ = g_new0 (gchar*, 2 + 1);
-		_tmp12_[0] = _tmp11_;
-		_tmp12_[1] = NULL;
-		keys = _tmp12_;
-		keys_length1 = 2;
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp12_ = g_strdup ("density-unit");
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp13_ = g_strdup ("x-density");
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp14_ = g_strdup ("y-density");
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp15_ = g_strdup ("icc-profile");
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp16_ = g_new0 (gchar*, 6 + 1);
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp16_[0] = _tmp11_;
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp16_[1] = _tmp12_;
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp16_[2] = _tmp13_;
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp16_[3] = _tmp14_;
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp16_[4] = _tmp15_;
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp16_[5] = NULL;
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		keys = _tmp16_;
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		keys_length1 = 6;
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_keys_size_ = keys_length1;
-		_tmp13_ = g_strdup ("90");
-		_tmp14_ = g_new0 (gchar*, 2 + 1);
-		_tmp14_[0] = _tmp13_;
-		_tmp14_[1] = NULL;
-		values = _tmp14_;
-		values_length1 = 2;
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp17_ = quality;
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp18_ = g_strdup_printf ("%d", _tmp17_);
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp19_ = g_strdup ("dots-per-inch");
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp20_ = self->priv->dpi;
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp21_ = g_strdup_printf ("%d", _tmp20_);
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp22_ = self->priv->dpi;
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp23_ = g_strdup_printf ("%d", _tmp22_);
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp24_ = icc_profile_data;
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp25_ = g_strdup (_tmp24_);
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp26_ = g_new0 (gchar*, 6 + 1);
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp26_[0] = _tmp18_;
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp26_[1] = _tmp19_;
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp26_[2] = _tmp21_;
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp26_[3] = _tmp23_;
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp26_[4] = _tmp25_;
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp26_[5] = NULL;
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		values = _tmp26_;
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		values_length1 = 6;
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_values_size_ = values_length1;
-		_tmp15_ = writer;
-		_tmp16_ = image;
-		_tmp17_ = keys;
-		_tmp17__length1 = keys_length1;
-		_tmp18_ = values;
-		_tmp18__length1 = values_length1;
-		pixbuf_writer_save (_tmp15_, _tmp16_, "jpeg", _tmp17_, _tmp17__length1, _tmp18_, _tmp18__length1, &_inner_error_);
+#line 709 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp27_ = icc_profile_data;
+#line 709 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		if (_tmp27_ == NULL) {
+#line 3639 "page.c"
+			gchar** _tmp28_;
+			gint _tmp28__length1;
+			gchar* _tmp29_;
+#line 710 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp28_ = keys;
+#line 710 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp28__length1 = keys_length1;
+#line 710 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_g_free0 (_tmp28_[4]);
+#line 710 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp28_[4] = NULL;
+#line 710 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp29_ = _tmp28_[4];
+#line 3653 "page.c"
+		}
+#line 711 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp30_ = writer;
+#line 711 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp31_ = image;
+#line 711 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp32_ = keys;
+#line 711 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp32__length1 = keys_length1;
+#line 711 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp33_ = values;
+#line 711 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp33__length1 = values_length1;
+#line 711 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		pixbuf_writer_save (_tmp30_, _tmp31_, "jpeg", _tmp32_, _tmp32__length1, _tmp33_, _tmp33__length1, &_inner_error_);
+#line 711 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (_inner_error_ != NULL) {
+#line 711 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			g_propagate_error (error, _inner_error_);
+#line 711 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
+#line 711 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
+#line 711 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_g_free0 (icc_profile_data);
+#line 711 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_g_object_unref0 (image);
+#line 711 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_pixbuf_writer_unref0 (writer);
+#line 711 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_g_object_unref0 (stream);
+#line 711 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			return;
+#line 3687 "page.c"
 		}
+#line 705 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
+#line 705 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
+#line 3693 "page.c"
 	} else {
-		GCompareFunc _tmp19_;
-		const gchar* _tmp20_;
-		gint _tmp21_ = 0;
-		_tmp19_ = g_strcmp0;
-		_tmp20_ = type;
-		_tmp21_ = _tmp19_ (_tmp20_, "png");
-		if (_tmp21_ == 0) {
-			gchar* _tmp22_;
-			gchar** _tmp23_ = NULL;
+		GCompareFunc _tmp34_;
+		const gchar* _tmp35_;
+		gint _tmp36_ = 0;
+#line 713 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp34_ = g_strcmp0;
+#line 713 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp35_ = type;
+#line 713 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		_tmp36_ = _tmp34_ (_tmp35_, "png");
+#line 713 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+		if (_tmp36_ == 0) {
+#line 3706 "page.c"
+			gchar* _tmp37_;
+			gchar** _tmp38_ = NULL;
 			gchar** keys;
 			gint keys_length1;
 			gint _keys_size_;
-			const gchar* _tmp24_;
-			gchar* _tmp25_;
-			gchar** _tmp26_ = NULL;
+			const gchar* _tmp39_;
+			gchar* _tmp40_;
+			gchar** _tmp41_ = NULL;
 			gchar** values;
 			gint values_length1;
 			gint _values_size_;
-			const gchar* _tmp27_;
-			PixbufWriter* _tmp30_;
-			GdkPixbuf* _tmp31_;
-			gchar** _tmp32_;
-			gint _tmp32__length1;
-			gchar** _tmp33_;
-			gint _tmp33__length1;
-			_tmp22_ = g_strdup ("icc-profile");
-			_tmp23_ = g_new0 (gchar*, 2 + 1);
-			_tmp23_[0] = _tmp22_;
-			_tmp23_[1] = NULL;
-			keys = _tmp23_;
+			const gchar* _tmp42_;
+			PixbufWriter* _tmp45_;
+			GdkPixbuf* _tmp46_;
+			gchar** _tmp47_;
+			gint _tmp47__length1;
+			gchar** _tmp48_;
+			gint _tmp48__length1;
+#line 715 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp37_ = g_strdup ("icc-profile");
+#line 715 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp38_ = g_new0 (gchar*, 2 + 1);
+#line 715 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp38_[0] = _tmp37_;
+#line 715 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp38_[1] = NULL;
+#line 715 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			keys = _tmp38_;
+#line 715 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			keys_length1 = 2;
+#line 715 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_keys_size_ = keys_length1;
-			_tmp24_ = icc_profile_data;
-			_tmp25_ = g_strdup (_tmp24_);
-			_tmp26_ = g_new0 (gchar*, 2 + 1);
-			_tmp26_[0] = _tmp25_;
-			_tmp26_[1] = NULL;
-			values = _tmp26_;
+#line 716 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp39_ = icc_profile_data;
+#line 716 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp40_ = g_strdup (_tmp39_);
+#line 716 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp41_ = g_new0 (gchar*, 2 + 1);
+#line 716 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp41_[0] = _tmp40_;
+#line 716 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp41_[1] = NULL;
+#line 716 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			values = _tmp41_;
+#line 716 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			values_length1 = 2;
+#line 716 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_values_size_ = values_length1;
-			_tmp27_ = icc_profile_data;
-			if (_tmp27_ == NULL) {
-				gchar** _tmp28_;
-				gint _tmp28__length1;
-				gchar* _tmp29_;
-				_tmp28_ = keys;
-				_tmp28__length1 = keys_length1;
-				_g_free0 (_tmp28_[0]);
-				_tmp28_[0] = NULL;
-				_tmp29_ = _tmp28_[0];
+#line 717 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp42_ = icc_profile_data;
+#line 717 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			if (_tmp42_ == NULL) {
+#line 3759 "page.c"
+				gchar** _tmp43_;
+				gint _tmp43__length1;
+				gchar* _tmp44_;
+#line 718 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp43_ = keys;
+#line 718 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp43__length1 = keys_length1;
+#line 718 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_g_free0 (_tmp43_[0]);
+#line 718 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp43_[0] = NULL;
+#line 718 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp44_ = _tmp43_[0];
+#line 3773 "page.c"
 			}
-			_tmp30_ = writer;
-			_tmp31_ = image;
-			_tmp32_ = keys;
-			_tmp32__length1 = keys_length1;
-			_tmp33_ = values;
-			_tmp33__length1 = values_length1;
-			pixbuf_writer_save (_tmp30_, _tmp31_, "png", _tmp32_, _tmp32__length1, _tmp33_, _tmp33__length1, &_inner_error_);
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp45_ = writer;
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp46_ = image;
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp47_ = keys;
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp47__length1 = keys_length1;
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp48_ = values;
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp48__length1 = values_length1;
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			pixbuf_writer_save (_tmp45_, _tmp46_, "png", _tmp47_, _tmp47__length1, _tmp48_, _tmp48__length1, &_inner_error_);
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			if (_inner_error_ != NULL) {
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				g_propagate_error (error, _inner_error_);
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_g_free0 (icc_profile_data);
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_g_object_unref0 (image);
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_pixbuf_writer_unref0 (writer);
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_g_object_unref0 (stream);
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				return;
+#line 3807 "page.c"
 			}
+#line 713 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
+#line 713 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
+#line 3813 "page.c"
 		} else {
-			GCompareFunc _tmp34_;
-			const gchar* _tmp35_;
-			gint _tmp36_ = 0;
-			_tmp34_ = g_strcmp0;
-			_tmp35_ = type;
-			_tmp36_ = _tmp34_ (_tmp35_, "tiff");
-			if (_tmp36_ == 0) {
-				gchar* _tmp37_;
-				gchar* _tmp38_;
-				gchar** _tmp39_ = NULL;
+			GCompareFunc _tmp49_;
+			const gchar* _tmp50_;
+			gint _tmp51_ = 0;
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp49_ = g_strcmp0;
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp50_ = type;
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp51_ = _tmp49_ (_tmp50_, "tiff");
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			if (_tmp51_ == 0) {
+#line 3826 "page.c"
+				gchar* _tmp52_;
+				gchar* _tmp53_;
+				gchar** _tmp54_ = NULL;
 				gchar** keys;
 				gint keys_length1;
 				gint _keys_size_;
-				gchar* _tmp40_;
-				const gchar* _tmp41_;
-				gchar* _tmp42_;
-				gchar** _tmp43_ = NULL;
+				gchar* _tmp55_;
+				const gchar* _tmp56_;
+				gchar* _tmp57_;
+				gchar** _tmp58_ = NULL;
 				gchar** values;
 				gint values_length1;
 				gint _values_size_;
-				const gchar* _tmp44_;
-				PixbufWriter* _tmp47_;
-				GdkPixbuf* _tmp48_;
-				gchar** _tmp49_;
-				gint _tmp49__length1;
-				gchar** _tmp50_;
-				gint _tmp50__length1;
-				_tmp37_ = g_strdup ("compression");
-				_tmp38_ = g_strdup ("icc-profile");
-				_tmp39_ = g_new0 (gchar*, 3 + 1);
-				_tmp39_[0] = _tmp37_;
-				_tmp39_[1] = _tmp38_;
-				_tmp39_[2] = NULL;
-				keys = _tmp39_;
+				const gchar* _tmp59_;
+				PixbufWriter* _tmp62_;
+				GdkPixbuf* _tmp63_;
+				gchar** _tmp64_;
+				gint _tmp64__length1;
+				gchar** _tmp65_;
+				gint _tmp65__length1;
+#line 723 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp52_ = g_strdup ("compression");
+#line 723 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp53_ = g_strdup ("icc-profile");
+#line 723 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp54_ = g_new0 (gchar*, 3 + 1);
+#line 723 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp54_[0] = _tmp52_;
+#line 723 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp54_[1] = _tmp53_;
+#line 723 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp54_[2] = NULL;
+#line 723 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				keys = _tmp54_;
+#line 723 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				keys_length1 = 3;
+#line 723 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_keys_size_ = keys_length1;
-				_tmp40_ = g_strdup ("8");
-				_tmp41_ = icc_profile_data;
-				_tmp42_ = g_strdup (_tmp41_);
-				_tmp43_ = g_new0 (gchar*, 3 + 1);
-				_tmp43_[0] = _tmp40_;
-				_tmp43_[1] = _tmp42_;
-				_tmp43_[2] = NULL;
-				values = _tmp43_;
+#line 724 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp55_ = g_strdup ("8");
+#line 724 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp56_ = icc_profile_data;
+#line 724 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp57_ = g_strdup (_tmp56_);
+#line 724 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp58_ = g_new0 (gchar*, 3 + 1);
+#line 724 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp58_[0] = _tmp55_;
+#line 724 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp58_[1] = _tmp57_;
+#line 724 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp58_[2] = NULL;
+#line 724 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				values = _tmp58_;
+#line 724 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				values_length1 = 3;
+#line 724 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_values_size_ = values_length1;
-				_tmp44_ = icc_profile_data;
-				if (_tmp44_ == NULL) {
-					gchar** _tmp45_;
-					gint _tmp45__length1;
-					gchar* _tmp46_;
-					_tmp45_ = keys;
-					_tmp45__length1 = keys_length1;
-					_g_free0 (_tmp45_[1]);
-					_tmp45_[1] = NULL;
-					_tmp46_ = _tmp45_[1];
+#line 725 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp59_ = icc_profile_data;
+#line 725 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				if (_tmp59_ == NULL) {
+#line 3889 "page.c"
+					gchar** _tmp60_;
+					gint _tmp60__length1;
+					gchar* _tmp61_;
+#line 726 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					_tmp60_ = keys;
+#line 726 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					_tmp60__length1 = keys_length1;
+#line 726 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					_g_free0 (_tmp60_[1]);
+#line 726 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					_tmp60_[1] = NULL;
+#line 726 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+					_tmp61_ = _tmp60_[1];
+#line 3903 "page.c"
 				}
-				_tmp47_ = writer;
-				_tmp48_ = image;
-				_tmp49_ = keys;
-				_tmp49__length1 = keys_length1;
-				_tmp50_ = values;
-				_tmp50__length1 = values_length1;
-				pixbuf_writer_save (_tmp47_, _tmp48_, "tiff", _tmp49_, _tmp49__length1, _tmp50_, _tmp50__length1, &_inner_error_);
+#line 727 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp62_ = writer;
+#line 727 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp63_ = image;
+#line 727 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp64_ = keys;
+#line 727 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp64__length1 = keys_length1;
+#line 727 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp65_ = values;
+#line 727 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp65__length1 = values_length1;
+#line 727 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				pixbuf_writer_save (_tmp62_, _tmp63_, "tiff", _tmp64_, _tmp64__length1, _tmp65_, _tmp65__length1, &_inner_error_);
+#line 727 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				if (_inner_error_ != NULL) {
+#line 727 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					g_propagate_error (error, _inner_error_);
+#line 727 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
+#line 727 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
+#line 727 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_g_free0 (icc_profile_data);
+#line 727 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_g_object_unref0 (image);
+#line 727 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_pixbuf_writer_unref0 (writer);
+#line 727 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_g_object_unref0 (stream);
+#line 727 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					return;
+#line 3937 "page.c"
 				}
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
+#line 3943 "page.c"
 			} else {
 			}
 		}
 	}
+#line 695 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_free0 (icc_profile_data);
+#line 695 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_object_unref0 (image);
+#line 695 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_pixbuf_writer_unref0 (writer);
+#line 695 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_object_unref0 (stream);
+#line 3956 "page.c"
 }
 
 
 static void value_page_init (GValue* value) {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	value->data[0].v_pointer = NULL;
+#line 3963 "page.c"
 }
 
 
 static void value_page_free_value (GValue* value) {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (value->data[0].v_pointer) {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		page_unref (value->data[0].v_pointer);
+#line 3972 "page.c"
 	}
 }
 
 
 static void value_page_copy_value (const GValue* src_value, GValue* dest_value) {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (src_value->data[0].v_pointer) {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		dest_value->data[0].v_pointer = page_ref (src_value->data[0].v_pointer);
+#line 3982 "page.c"
 	} else {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		dest_value->data[0].v_pointer = NULL;
+#line 3986 "page.c"
 	}
 }
 
 
 static gpointer value_page_peek_pointer (const GValue* value) {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return value->data[0].v_pointer;
+#line 3994 "page.c"
 }
 
 
 static gchar* value_page_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (collect_values[0].v_pointer) {
+#line 4001 "page.c"
 		Page* object;
 		object = collect_values[0].v_pointer;
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (object->parent_instance.g_class == NULL) {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+#line 4008 "page.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+#line 4012 "page.c"
 		}
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = page_ref (object);
+#line 4016 "page.c"
 	} else {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = NULL;
+#line 4020 "page.c"
 	}
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return NULL;
+#line 4024 "page.c"
 }
 
 
 static gchar* value_page_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	Page** object_p;
 	object_p = collect_values[0].v_pointer;
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (!object_p) {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
+#line 4035 "page.c"
 	}
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (!value->data[0].v_pointer) {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*object_p = NULL;
+#line 4041 "page.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*object_p = value->data[0].v_pointer;
+#line 4045 "page.c"
 	} else {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*object_p = page_ref (value->data[0].v_pointer);
+#line 4049 "page.c"
 	}
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return NULL;
+#line 4053 "page.c"
 }
 
 
 GParamSpec* param_spec_page (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecPage* spec;
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_PAGE), NULL);
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return G_PARAM_SPEC (spec);
+#line 4067 "page.c"
 }
 
 
 gpointer value_get_page (const GValue* value) {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PAGE), NULL);
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return value->data[0].v_pointer;
+#line 4076 "page.c"
 }
 
 
 void value_set_page (GValue* value, gpointer v_object) {
 	Page* old;
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PAGE));
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	old = value->data[0].v_pointer;
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (v_object) {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PAGE));
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = v_object;
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		page_ref (value->data[0].v_pointer);
+#line 4096 "page.c"
 	} else {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = NULL;
+#line 4100 "page.c"
 	}
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (old) {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		page_unref (old);
+#line 4106 "page.c"
 	}
 }
 
 
 void value_take_page (GValue* value, gpointer v_object) {
 	Page* old;
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PAGE));
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	old = value->data[0].v_pointer;
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (v_object) {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PAGE));
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = v_object;
+#line 4125 "page.c"
 	} else {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = NULL;
+#line 4129 "page.c"
 	}
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (old) {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		page_unref (old);
+#line 4135 "page.c"
 	}
 }
 
 
 static void page_class_init (PageClass * klass) {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_parent_class = g_type_class_peek_parent (klass);
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	PAGE_CLASS (klass)->finalize = page_finalize;
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_type_class_add_private (klass, sizeof (PagePrivate));
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_new ("pixels_changed", TYPE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_new ("size_changed", TYPE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_new ("scan_line_changed", TYPE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_new ("scan_direction_changed", TYPE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_new ("crop_changed", TYPE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+	g_signal_new ("scan_finished", TYPE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 4159 "page.c"
 }
 
 
 static void page_instance_init (Page * self) {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv = PAGE_GET_PRIVATE (self);
+#line 51 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->scan_direction = SCAN_DIRECTION_TOP_TO_BOTTOM;
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->ref_count = 1;
+#line 4170 "page.c"
 }
 
 
 static void page_finalize (Page* obj) {
 	Page * self;
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PAGE, Page);
+#line 32 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_free0 (self->priv->color_profile);
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->pixels = (g_free (self->priv->pixels), NULL);
+#line 55 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_free0 (self->priv->crop_name);
+#line 4184 "page.c"
 }
 
 
@@ -2569,49 +4201,63 @@ GType page_get_type (void) {
 gpointer page_ref (gpointer instance) {
 	Page* self;
 	self = instance;
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_atomic_int_inc (&self->ref_count);
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return instance;
+#line 4209 "page.c"
 }
 
 
 void page_unref (gpointer instance) {
 	Page* self;
 	self = instance;
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		PAGE_GET_CLASS (self)->finalize (self);
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_type_free_instance ((GTypeInstance *) self);
+#line 4222 "page.c"
 	}
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
-	return self ? g_object_ref (self) : NULL;
-}
-
-
 PixbufWriter* pixbuf_writer_construct (GType object_type, GFileOutputStream* stream) {
 	PixbufWriter* self = NULL;
 	GFileOutputStream* _tmp0_;
 	GFileOutputStream* _tmp1_;
+#line 738 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (stream != NULL, NULL);
+#line 738 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self = (PixbufWriter*) g_type_create_instance (object_type);
+#line 740 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = stream;
+#line 740 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 740 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_object_unref0 (self->stream);
+#line 740 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->stream = _tmp1_;
+#line 738 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return self;
+#line 4245 "page.c"
 }
 
 
 PixbufWriter* pixbuf_writer_new (GFileOutputStream* stream) {
+#line 738 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return pixbuf_writer_construct (TYPE_PIXBUF_WRITER, stream);
+#line 4252 "page.c"
 }
 
 
 static gboolean _pixbuf_writer_write_pixbuf_data_gdk_pixbuf_save_func (guint8* buf, gsize buf_length1, GError** error, gpointer self) {
 	gboolean result;
 	result = pixbuf_writer_write_pixbuf_data (self, buf, buf_length1, error);
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
+#line 4261 "page.c"
 }
 
 
@@ -2623,19 +4269,33 @@ void pixbuf_writer_save (PixbufWriter* self, GdkPixbuf* image, const gchar* type
 	gchar** _tmp3_;
 	gint _tmp3__length1;
 	GError * _inner_error_ = NULL;
+#line 743 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
+#line 743 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (image != NULL);
+#line 743 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (type != NULL);
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = image;
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = type;
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp2_ = option_keys;
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp2__length1 = option_keys_length1;
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp3_ = option_values;
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp3__length1 = option_values_length1;
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	gdk_pixbuf_save_to_callbackv (_tmp0_, _pixbuf_writer_write_pixbuf_data_gdk_pixbuf_save_func, self, _tmp1_, _tmp2_, _tmp3_, &_inner_error_);
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_inner_error_ != NULL) {
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_propagate_error (error, _inner_error_);
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return;
+#line 4299 "page.c"
 	}
 }
 
@@ -2646,145 +4306,235 @@ static gboolean pixbuf_writer_write_pixbuf_data (PixbufWriter* self, guint8* buf
 	guint8* _tmp1_;
 	gint _tmp1__length1;
 	GError * _inner_error_ = NULL;
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
+#line 750 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->stream;
+#line 750 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = buf;
+#line 750 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1__length1 = buf_length1;
+#line 750 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_output_stream_write_all ((GOutputStream*) _tmp0_, _tmp1_, (gsize) _tmp1__length1, NULL, NULL, &_inner_error_);
+#line 750 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_inner_error_ != NULL) {
+#line 750 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_propagate_error (error, _inner_error_);
+#line 750 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return FALSE;
+#line 4326 "page.c"
 	}
+#line 751 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = TRUE;
+#line 751 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
+#line 4332 "page.c"
 }
 
 
 static void value_pixbuf_writer_init (GValue* value) {
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	value->data[0].v_pointer = NULL;
+#line 4339 "page.c"
 }
 
 
 static void value_pixbuf_writer_free_value (GValue* value) {
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (value->data[0].v_pointer) {
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		pixbuf_writer_unref (value->data[0].v_pointer);
+#line 4348 "page.c"
 	}
 }
 
 
 static void value_pixbuf_writer_copy_value (const GValue* src_value, GValue* dest_value) {
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (src_value->data[0].v_pointer) {
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		dest_value->data[0].v_pointer = pixbuf_writer_ref (src_value->data[0].v_pointer);
+#line 4358 "page.c"
 	} else {
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		dest_value->data[0].v_pointer = NULL;
+#line 4362 "page.c"
 	}
 }
 
 
 static gpointer value_pixbuf_writer_peek_pointer (const GValue* value) {
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return value->data[0].v_pointer;
+#line 4370 "page.c"
 }
 
 
 static gchar* value_pixbuf_writer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (collect_values[0].v_pointer) {
+#line 4377 "page.c"
 		PixbufWriter* object;
 		object = collect_values[0].v_pointer;
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (object->parent_instance.g_class == NULL) {
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+#line 4384 "page.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+#line 4388 "page.c"
 		}
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = pixbuf_writer_ref (object);
+#line 4392 "page.c"
 	} else {
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = NULL;
+#line 4396 "page.c"
 	}
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return NULL;
+#line 4400 "page.c"
 }
 
 
 static gchar* value_pixbuf_writer_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PixbufWriter** object_p;
 	object_p = collect_values[0].v_pointer;
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (!object_p) {
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
+#line 4411 "page.c"
 	}
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (!value->data[0].v_pointer) {
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*object_p = NULL;
+#line 4417 "page.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*object_p = value->data[0].v_pointer;
+#line 4421 "page.c"
 	} else {
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*object_p = pixbuf_writer_ref (value->data[0].v_pointer);
+#line 4425 "page.c"
 	}
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return NULL;
+#line 4429 "page.c"
 }
 
 
 GParamSpec* param_spec_pixbuf_writer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecPixbufWriter* spec;
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_PIXBUF_WRITER), NULL);
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return G_PARAM_SPEC (spec);
+#line 4443 "page.c"
 }
 
 
 gpointer value_get_pixbuf_writer (const GValue* value) {
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXBUF_WRITER), NULL);
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return value->data[0].v_pointer;
+#line 4452 "page.c"
 }
 
 
 void value_set_pixbuf_writer (GValue* value, gpointer v_object) {
 	PixbufWriter* old;
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXBUF_WRITER));
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	old = value->data[0].v_pointer;
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (v_object) {
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PIXBUF_WRITER));
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = v_object;
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		pixbuf_writer_ref (value->data[0].v_pointer);
+#line 4472 "page.c"
 	} else {
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = NULL;
+#line 4476 "page.c"
 	}
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (old) {
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		pixbuf_writer_unref (old);
+#line 4482 "page.c"
 	}
 }
 
 
 void value_take_pixbuf_writer (GValue* value, gpointer v_object) {
 	PixbufWriter* old;
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXBUF_WRITER));
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	old = value->data[0].v_pointer;
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (v_object) {
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PIXBUF_WRITER));
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = v_object;
+#line 4501 "page.c"
 	} else {
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = NULL;
+#line 4505 "page.c"
 	}
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (old) {
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		pixbuf_writer_unref (old);
+#line 4511 "page.c"
 	}
 }
 
 
 static void pixbuf_writer_class_init (PixbufWriterClass * klass) {
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	pixbuf_writer_parent_class = g_type_class_peek_parent (klass);
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	PIXBUF_WRITER_CLASS (klass)->finalize = pixbuf_writer_finalize;
+#line 4521 "page.c"
 }
 
 
 static void pixbuf_writer_instance_init (PixbufWriter * self) {
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->ref_count = 1;
+#line 4528 "page.c"
 }
 
 
 static void pixbuf_writer_finalize (PixbufWriter* obj) {
 	PixbufWriter * self;
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PIXBUF_WRITER, PixbufWriter);
+#line 736 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_object_unref0 (self->stream);
+#line 4538 "page.c"
 }
 
 
@@ -2805,17 +4555,24 @@ GType pixbuf_writer_get_type (void) {
 gpointer pixbuf_writer_ref (gpointer instance) {
 	PixbufWriter* self;
 	self = instance;
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_atomic_int_inc (&self->ref_count);
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return instance;
+#line 4563 "page.c"
 }
 
 
 void pixbuf_writer_unref (gpointer instance) {
 	PixbufWriter* self;
 	self = instance;
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		PIXBUF_WRITER_GET_CLASS (self)->finalize (self);
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_type_free_instance ((GTypeInstance *) self);
+#line 4576 "page.c"
 	}
 }
 
diff --git a/src/page.vala b/src/page.vala
index 3bf34d7..f27258c 100644
--- a/src/page.vala
+++ b/src/page.vala
@@ -63,6 +63,7 @@ public class Page
     public signal void scan_line_changed ();
     public signal void scan_direction_changed ();
     public signal void crop_changed ();
+    public signal void scan_finished ();
 
     public Page (int width, int height, int dpi, ScanDirection scan_direction)
     {
@@ -199,6 +200,7 @@ public class Page
         if (size_has_changed)
             size_changed ();
         scan_line_changed ();
+        scan_finished ();
     }
 
     public ScanDirection get_scan_direction ()
@@ -541,6 +543,13 @@ public class Page
         return pixels;
     }
 
+    public void set_pixels (uchar[] new_pixels)
+    {
+        pixels = new_pixels;
+        has_data_ = new_pixels != null;
+        pixels_changed ();
+    }
+
     // FIXME: Copied from page-view, should be shared code
     private uchar get_sample (uchar[] pixels, int offset, int x, int depth, int n_channels, int channel)
     {
@@ -674,8 +683,16 @@ public class Page
         /* Encode into base64 */
         return Base64.encode ((uchar[]) contents.to_utf8 ());
     }
+    
+    public void copy_to_clipboard (Gtk.Window window)
+    {        
+        Gdk.Display display = window.get_display ();
+        Gtk.Clipboard clipboard = Gtk.Clipboard.get_for_display (display, Gdk.SELECTION_CLIPBOARD);
+        var image = get_image (true);
+        clipboard.set_image(image);
+    }
 
-    public void save (string type, File file) throws Error
+    public void save (string type, int quality, File file) throws Error
     {
         var stream = file.replace (null, false, FileCreateFlags.NONE, null);
         var writer = new PixbufWriter (stream);
@@ -687,9 +704,10 @@ public class Page
 
         if (strcmp (type, "jpeg") == 0)
         {
-            /* ICC profile is awaiting review in gtk2+ bugzilla */
-            string[] keys = { "quality", /* "icc-profile", */ null };
-            string[] values = { "90", /* icc_profile_data, */ null };
+            string[] keys = { "quality", "density-unit", "x-density", "y-density", "icc-profile", null };
+            string[] values = { "%d".printf (quality), "dots-per-inch", "%d".printf (dpi), "%d".printf (dpi), icc_profile_data, null };
+            if (icc_profile_data == null)
+                keys[4] = null;
             writer.save (image, "jpeg", keys, values);
         }
         else if (strcmp (type, "png") == 0)
diff --git a/src/resources.c b/src/resources.c
new file mode 100644
index 0000000..9354d37
--- /dev/null
+++ b/src/resources.c
@@ -0,0 +1,4953 @@
+#include <gio/gio.h>
+
+#if defined (__ELF__) && ( __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 6))
+# define SECTION __attribute__ ((section (".gresource.simple_scan"), aligned (8)))
+#else
+# define SECTION
+#endif
+
+static const SECTION union { const guint8 data[38553]; const double alignment; void * const ptr;}  simple_scan_resource_data = { {
+  0x47, 0x56, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x18, 0x00, 0x00, 0x00, 0xac, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x28, 0x05, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 
+  0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 
+  0x05, 0x00, 0x00, 0x00, 0xd4, 0xb5, 0x02, 0x00, 
+  0xff, 0xff, 0xff, 0xff, 0xac, 0x00, 0x00, 0x00, 
+  0x01, 0x00, 0x4c, 0x00, 0xb0, 0x00, 0x00, 0x00, 
+  0xb4, 0x00, 0x00, 0x00, 0x4b, 0x50, 0x90, 0x0b, 
+  0x00, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00, 
+  0x04, 0x00, 0x4c, 0x00, 0xb8, 0x00, 0x00, 0x00, 
+  0xbc, 0x00, 0x00, 0x00, 0x6e, 0xa3, 0x22, 0x37, 
+  0x03, 0x00, 0x00, 0x00, 0xbc, 0x00, 0x00, 0x00, 
+  0x0b, 0x00, 0x4c, 0x00, 0xc8, 0x00, 0x00, 0x00, 
+  0xcc, 0x00, 0x00, 0x00, 0xb0, 0xb7, 0x24, 0x30, 
+  0x01, 0x00, 0x00, 0x00, 0xcc, 0x00, 0x00, 0x00, 
+  0x06, 0x00, 0x4c, 0x00, 0xd4, 0x00, 0x00, 0x00, 
+  0xd8, 0x00, 0x00, 0x00, 0x76, 0x8d, 0xc8, 0xbd, 
+  0x02, 0x00, 0x00, 0x00, 0xd8, 0x00, 0x00, 0x00, 
+  0x0e, 0x00, 0x76, 0x00, 0xe8, 0x00, 0x00, 0x00, 
+  0x99, 0x96, 0x00, 0x00, 0x2f, 0x00, 0x00, 0x00, 
+  0x01, 0x00, 0x00, 0x00, 0x6f, 0x72, 0x67, 0x2f, 
+  0x03, 0x00, 0x00, 0x00, 0x53, 0x69, 0x6d, 0x70, 
+  0x6c, 0x65, 0x53, 0x63, 0x61, 0x6e, 0x2f, 0x00, 
+  0x04, 0x00, 0x00, 0x00, 0x67, 0x6e, 0x6f, 0x6d, 
+  0x65, 0x2f, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 
+  0x73, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x2d, 0x73, 
+  0x63, 0x61, 0x6e, 0x2e, 0x75, 0x69, 0x00, 0x00, 
+  0xa1, 0x95, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, 
+  0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, 
+  0x2e, 0x30, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, 0x69, 
+  0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 
+  0x3e, 0x3c, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 
+  0x65, 0x73, 0x20, 0x6c, 0x69, 0x62, 0x3d, 0x22, 
+  0x67, 0x74, 0x6b, 0x2b, 0x22, 0x20, 0x76, 0x65, 
+  0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x32, 
+  0x2e, 0x31, 0x36, 0x22, 0x2f, 0x3e, 0x3c, 0x21, 
+  0x2d, 0x2d, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 
+  0x66, 0x61, 0x63, 0x65, 0x2d, 0x6e, 0x61, 0x6d, 
+  0x69, 0x6e, 0x67, 0x2d, 0x70, 0x6f, 0x6c, 0x69, 
+  0x63, 0x79, 0x20, 0x70, 0x72, 0x6f, 0x6a, 0x65, 
+  0x63, 0x74, 0x2d, 0x77, 0x69, 0x64, 0x65, 0x20, 
+  0x2d, 0x2d, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
+  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x57, 0x69, 0x6e, 
+  0x64, 0x6f, 0x77, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x5f, 
+  0x73, 0x63, 0x61, 0x6e, 0x5f, 0x77, 0x69, 0x6e, 
+  0x64, 0x6f, 0x77, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x69, 0x74, 
+  0x6c, 0x65, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
+  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
+  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 
+  0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 
+  0x22, 0x54, 0x69, 0x74, 0x6c, 0x65, 0x20, 0x6f, 
+  0x66, 0x20, 0x73, 0x63, 0x61, 0x6e, 0x20, 0x77, 
+  0x69, 0x6e, 0x64, 0x6f, 0x77, 0x22, 0x3e, 0x53, 
+  0x69, 0x6d, 0x70, 0x6c, 0x65, 0x20, 0x53, 0x63, 
+  0x61, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 
+  0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 
+  0x73, 0x63, 0x61, 0x6e, 0x6e, 0x65, 0x72, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 
+  0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 
+  0x65, 0x5f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x22, 
+  0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 
+  0x3d, 0x22, 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x65, 
+  0x5f, 0x73, 0x63, 0x61, 0x6e, 0x5f, 0x77, 0x69, 
+  0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x63, 0x6f, 0x6e, 
+  0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x5f, 0x65, 
+  0x76, 0x65, 0x6e, 0x74, 0x5f, 0x63, 0x62, 0x22, 
+  0x2f, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 
+  0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x5f, 0x65, 
+  0x76, 0x65, 0x6e, 0x74, 0x22, 0x20, 0x68, 0x61, 
+  0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x77, 
+  0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x64, 0x65, 
+  0x6c, 0x65, 0x74, 0x65, 0x5f, 0x65, 0x76, 0x65, 
+  0x6e, 0x74, 0x5f, 0x63, 0x62, 0x22, 0x2f, 0x3e, 
+  0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 
+  0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x73, 0x74, 0x61, 
+  0x74, 0x65, 0x5f, 0x65, 0x76, 0x65, 0x6e, 0x74, 
+  0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 
+  0x72, 0x3d, 0x22, 0x73, 0x69, 0x6d, 0x70, 0x6c, 
+  0x65, 0x5f, 0x73, 0x63, 0x61, 0x6e, 0x5f, 0x77, 
+  0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x77, 0x69, 
+  0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x73, 0x74, 0x61, 
+  0x74, 0x65, 0x5f, 0x65, 0x76, 0x65, 0x6e, 0x74, 
+  0x5f, 0x63, 0x62, 0x22, 0x2f, 0x3e, 0x3c, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
+  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x56, 
+  0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x6d, 0x61, 0x69, 0x6e, 0x5f, 0x76, 0x62, 
+  0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
+  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
+  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 
+  0x75, 0x42, 0x61, 0x72, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x6d, 0x65, 0x6e, 0x75, 0x62, 0x61, 
+  0x72, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
+  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
+  0x22, 0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 
+  0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 
+  0x6e, 0x74, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
+  0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
+  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
+  0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
+  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
+  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 
+  0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 
+  0x22, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x6f, 
+  0x6e, 0x20, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 
+  0x6e, 0x74, 0x20, 0x6d, 0x65, 0x6e, 0x75, 0x20, 
+  0x28, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 
+  0x73, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 
+  0x73, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x74, 0x68, 
+  0x69, 0x73, 0x20, 0x64, 0x6f, 0x63, 0x75, 0x6d, 
+  0x65, 0x6e, 0x74, 0x2c, 0x20, 0x65, 0x2e, 0x67, 
+  0x2e, 0x20, 0x73, 0x61, 0x76, 0x65, 0x2c, 0x20, 
+  0x70, 0x72, 0x69, 0x6e, 0x74, 0x29, 0x22, 0x3e, 
+  0x5f, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 
+  0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 
+  0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 
+  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x73, 
+  0x75, 0x62, 0x6d, 0x65, 0x6e, 0x75, 0x22, 0x3e, 
+  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
+  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
+  0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x22, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x64, 0x6f, 0x63, 0x75, 
+  0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x6d, 0x65, 0x6e, 
+  0x75, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
+  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
+  0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, 
+  0x65, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 
+  0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6e, 
+  0x65, 0x77, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
+  0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
+  0x65, 0x6c, 0x22, 0x3e, 0x67, 0x74, 0x6b, 0x2d, 
+  0x6e, 0x65, 0x77, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
+  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 
+  0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 
+  0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 
+  0x73, 0x74, 0x6f, 0x63, 0x6b, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 
+  0x63, 0x63, 0x65, 0x6c, 0x65, 0x72, 0x61, 0x74, 
+  0x6f, 0x72, 0x20, 0x6b, 0x65, 0x79, 0x3d, 0x22, 
+  0x6e, 0x22, 0x20, 0x73, 0x69, 0x67, 0x6e, 0x61, 
+  0x6c, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 
+  0x61, 0x74, 0x65, 0x22, 0x20, 0x6d, 0x6f, 0x64, 
+  0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x3d, 0x22, 
+  0x47, 0x44, 0x4b, 0x5f, 0x43, 0x4f, 0x4e, 0x54, 
+  0x52, 0x4f, 0x4c, 0x5f, 0x4d, 0x41, 0x53, 0x4b, 
+  0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 
+  0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 
+  0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 
+  0x65, 0x72, 0x3d, 0x22, 0x6e, 0x65, 0x77, 0x5f, 
+  0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x63, 
+  0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x63, 
+  0x62, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
+  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, 
+  0x61, 0x67, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x49, 
+  0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x73, 0x63, 0x61, 0x6e, 0x5f, 0x6d, 0x65, 
+  0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 
+  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
+  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
+  0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 
+  0x74, 0x73, 0x3d, 0x22, 0x53, 0x63, 0x61, 0x6e, 
+  0x20, 0x6d, 0x65, 0x6e, 0x75, 0x20, 0x69, 0x74, 
+  0x65, 0x6d, 0x22, 0x3e, 0x53, 0x63, 0x5f, 0x61, 
+  0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
+  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 
+  0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 
+  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x73, 0x74, 
+  0x6f, 0x63, 0x6b, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
+  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x20, 0x74, 0x79, 0x70, 0x65, 
+  0x3d, 0x22, 0x73, 0x75, 0x62, 0x6d, 0x65, 0x6e, 
+  0x75, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
+  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 
+  0x75, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 
+  0x63, 0x61, 0x6e, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
+  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 
+  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
+  0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x49, 
+  0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x73, 0x63, 0x61, 0x6e, 0x5f, 0x73, 0x69, 
+  0x6e, 0x67, 0x6c, 0x65, 0x5f, 0x6d, 0x65, 0x6e, 
+  0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
+  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
+  0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 
+  0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 
+  0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 
+  0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 
+  0x73, 0x3d, 0x22, 0x53, 0x63, 0x61, 0x6e, 0x20, 
+  0x6d, 0x65, 0x6e, 0x75, 0x20, 0x69, 0x74, 0x65, 
+  0x6d, 0x20, 0x74, 0x6f, 0x20, 0x73, 0x63, 0x61, 
+  0x6e, 0x20, 0x61, 0x20, 0x73, 0x69, 0x6e, 0x67, 
+  0x6c, 0x65, 0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 
+  0x66, 0x72, 0x6f, 0x6d, 0x20, 0x74, 0x68, 0x65, 
+  0x20, 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x65, 0x72, 
+  0x22, 0x3e, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 
+  0x20, 0x5f, 0x50, 0x61, 0x67, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 
+  0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x61, 0x63, 0x63, 0x65, 0x6c, 0x65, 0x72, 0x61, 
+  0x74, 0x6f, 0x72, 0x20, 0x6b, 0x65, 0x79, 0x3d, 
+  0x22, 0x31, 0x22, 0x20, 0x73, 0x69, 0x67, 0x6e, 
+  0x61, 0x6c, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 
+  0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 0x6d, 0x6f, 
+  0x64, 0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x3d, 
+  0x22, 0x47, 0x44, 0x4b, 0x5f, 0x43, 0x4f, 0x4e, 
+  0x54, 0x52, 0x4f, 0x4c, 0x5f, 0x4d, 0x41, 0x53, 
+  0x4b, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x69, 0x67, 
+  0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 
+  0x74, 0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 
+  0x6c, 0x65, 0x72, 0x3d, 0x22, 0x73, 0x63, 0x61, 
+  0x6e, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
+  0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 
+  0x5f, 0x63, 0x62, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
+  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
+  0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x63, 
+  0x61, 0x6e, 0x5f, 0x61, 0x6c, 0x6c, 0x5f, 0x6d, 
+  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 
+  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
+  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
+  0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 
+  0x6e, 0x74, 0x73, 0x3d, 0x22, 0x53, 0x63, 0x61, 
+  0x6e, 0x20, 0x6d, 0x65, 0x6e, 0x75, 0x20, 0x69, 
+  0x74, 0x65, 0x6d, 0x20, 0x74, 0x6f, 0x20, 0x73, 
+  0x63, 0x61, 0x6e, 0x20, 0x61, 0x6c, 0x6c, 0x20, 
+  0x70, 0x61, 0x67, 0x65, 0x73, 0x20, 0x66, 0x72, 
+  0x6f, 0x6d, 0x20, 0x61, 0x20, 0x64, 0x6f, 0x63, 
+  0x75, 0x6d, 0x65, 0x6e, 0x74, 0x20, 0x66, 0x65, 
+  0x65, 0x64, 0x65, 0x72, 0x22, 0x3e, 0x41, 0x6c, 
+  0x6c, 0x20, 0x50, 0x61, 0x67, 0x65, 0x73, 0x20, 
+  0x46, 0x72, 0x6f, 0x6d, 0x20, 0x5f, 0x46, 0x65, 
+  0x65, 0x64, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 
+  0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 
+  0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x63, 
+  0x63, 0x65, 0x6c, 0x65, 0x72, 0x61, 0x74, 0x6f, 
+  0x72, 0x20, 0x6b, 0x65, 0x79, 0x3d, 0x22, 0x66, 
+  0x22, 0x20, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 
+  0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 
+  0x74, 0x65, 0x22, 0x20, 0x6d, 0x6f, 0x64, 0x69, 
+  0x66, 0x69, 0x65, 0x72, 0x73, 0x3d, 0x22, 0x47, 
+  0x44, 0x4b, 0x5f, 0x43, 0x4f, 0x4e, 0x54, 0x52, 
+  0x4f, 0x4c, 0x5f, 0x4d, 0x41, 0x53, 0x4b, 0x22, 
+  0x2f, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 
+  0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 
+  0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 
+  0x72, 0x3d, 0x22, 0x63, 0x6f, 0x6e, 0x74, 0x69, 
+  0x6e, 0x75, 0x6f, 0x75, 0x73, 0x5f, 0x73, 0x63, 
+  0x61, 0x6e, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 
+  0x6e, 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 
+  0x64, 0x5f, 0x63, 0x62, 0x22, 0x2f, 0x3e, 0x3c, 
+  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
+  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
+  0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 
+  0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 
+  0x74, 0x6f, 0x70, 0x5f, 0x73, 0x63, 0x61, 0x6e, 
+  0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
+  0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
+  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x73, 0x65, 0x6e, 0x73, 0x69, 
+  0x74, 0x69, 0x76, 0x65, 0x22, 0x3e, 0x46, 0x61, 
+  0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 
+  0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 
+  0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 
+  0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 
+  0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 
+  0x3d, 0x22, 0x4d, 0x65, 0x6e, 0x75, 0x20, 0x65, 
+  0x6e, 0x74, 0x72, 0x79, 0x20, 0x74, 0x6f, 0x20, 
+  0x73, 0x74, 0x6f, 0x70, 0x20, 0x63, 0x75, 0x72, 
+  0x72, 0x65, 0x6e, 0x74, 0x20, 0x73, 0x63, 0x61, 
+  0x6e, 0x22, 0x3e, 0x5f, 0x53, 0x74, 0x6f, 0x70, 
+  0x20, 0x53, 0x63, 0x61, 0x6e, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 
+  0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 
+  0x63, 0x63, 0x65, 0x6c, 0x65, 0x72, 0x61, 0x74, 
+  0x6f, 0x72, 0x20, 0x6b, 0x65, 0x79, 0x3d, 0x22, 
+  0x45, 0x73, 0x63, 0x61, 0x70, 0x65, 0x22, 0x20, 
+  0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x3d, 0x22, 
+  0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 
+  0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 
+  0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 
+  0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 
+  0x65, 0x72, 0x3d, 0x22, 0x73, 0x74, 0x6f, 0x70, 
+  0x5f, 0x73, 0x63, 0x61, 0x6e, 0x5f, 0x62, 0x75, 
+  0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x63, 0x6c, 0x69, 
+  0x63, 0x6b, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 
+  0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
+  0x22, 0x47, 0x74, 0x6b, 0x53, 0x65, 0x70, 0x61, 
+  0x72, 0x61, 0x74, 0x6f, 0x72, 0x4d, 0x65, 0x6e, 
+  0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 
+  0x64, 0x3d, 0x22, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
+  0x74, 0x65, 0x6d, 0x32, 0x22, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
+  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
+  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
+  0x52, 0x61, 0x64, 0x69, 0x6f, 0x4d, 0x65, 0x6e, 
+  0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 
+  0x64, 0x3d, 0x22, 0x74, 0x65, 0x78, 0x74, 0x5f, 
+  0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
+  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 
+  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
+  0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 
+  0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 
+  0x65, 0x73, 0x22, 0x3e, 0x54, 0x65, 0x78, 0x74, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 
+  0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x61, 0x73, 
+  0x5f, 0x72, 0x61, 0x64, 0x69, 0x6f, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x67, 
+  0x67, 0x6c, 0x65, 0x64, 0x22, 0x20, 0x68, 0x61, 
+  0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x74, 
+  0x65, 0x78, 0x74, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
+  0x69, 0x74, 0x65, 0x6d, 0x5f, 0x74, 0x6f, 0x67, 
+  0x67, 0x6c, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 
+  0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
+  0x22, 0x47, 0x74, 0x6b, 0x52, 0x61, 0x64, 0x69, 
+  0x6f, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 
+  0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 
+  0x68, 0x6f, 0x74, 0x6f, 0x5f, 0x6d, 0x65, 0x6e, 
+  0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
+  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
+  0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 
+  0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 
+  0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 
+  0x3e, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 
+  0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 
+  0x63, 0x74, 0x69, 0x76, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, 
+  0x61, 0x77, 0x5f, 0x61, 0x73, 0x5f, 0x72, 0x61, 
+  0x64, 0x69, 0x6f, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x67, 0x72, 0x6f, 0x75, 
+  0x70, 0x22, 0x3e, 0x74, 0x65, 0x78, 0x74, 0x5f, 
+  0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 
+  0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x64, 
+  0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 
+  0x72, 0x3d, 0x22, 0x70, 0x68, 0x6f, 0x74, 0x6f, 
+  0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
+  0x6d, 0x5f, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 
+  0x64, 0x5f, 0x63, 0x62, 0x22, 0x2f, 0x3e, 0x3c, 
+  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
+  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
+  0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 
+  0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x61, 
+  0x76, 0x65, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
+  0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
+  0x65, 0x6c, 0x22, 0x3e, 0x67, 0x74, 0x6b, 0x2d, 
+  0x73, 0x61, 0x76, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
+  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 
+  0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 
+  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 
+  0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x75, 0x73, 0x65, 0x5f, 0x73, 0x74, 0x6f, 0x63, 
+  0x6b, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x61, 0x63, 0x63, 0x65, 0x6c, 
+  0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, 0x6b, 
+  0x65, 0x79, 0x3d, 0x22, 0x73, 0x22, 0x20, 0x73, 
+  0x69, 0x67, 0x6e, 0x61, 0x6c, 0x3d, 0x22, 0x61, 
+  0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 
+  0x20, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 
+  0x72, 0x73, 0x3d, 0x22, 0x47, 0x44, 0x4b, 0x5f, 
+  0x43, 0x4f, 0x4e, 0x54, 0x52, 0x4f, 0x4c, 0x5f, 
+  0x4d, 0x41, 0x53, 0x4b, 0x22, 0x2f, 0x3e, 0x3c, 
+  0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 
+  0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 0x68, 
+  0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 
+  0x73, 0x61, 0x76, 0x65, 0x5f, 0x66, 0x69, 0x6c, 
+  0x65, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
+  0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 
+  0x5f, 0x63, 0x62, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
+  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
+  0x49, 0x6d, 0x61, 0x67, 0x65, 0x4d, 0x65, 0x6e, 
+  0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 
+  0x64, 0x3d, 0x22, 0x73, 0x61, 0x76, 0x65, 0x5f, 
+  0x61, 0x73, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
+  0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
+  0x65, 0x6c, 0x22, 0x3e, 0x67, 0x74, 0x6b, 0x2d, 
+  0x73, 0x61, 0x76, 0x65, 0x2d, 0x61, 0x73, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 
+  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x73, 0x65, 0x6e, 0x73, 0x69, 0x74, 
+  0x69, 0x76, 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
+  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 
+  0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 
+  0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x73, 
+  0x74, 0x6f, 0x63, 0x6b, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x63, 
+  0x63, 0x65, 0x6c, 0x65, 0x72, 0x61, 0x74, 0x6f, 
+  0x72, 0x20, 0x6b, 0x65, 0x79, 0x3d, 0x22, 0x73, 
+  0x22, 0x20, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 
+  0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 
+  0x74, 0x65, 0x22, 0x20, 0x6d, 0x6f, 0x64, 0x69, 
+  0x66, 0x69, 0x65, 0x72, 0x73, 0x3d, 0x22, 0x47, 
+  0x44, 0x4b, 0x5f, 0x53, 0x48, 0x49, 0x46, 0x54, 
+  0x5f, 0x4d, 0x41, 0x53, 0x4b, 0x20, 0x7c, 0x20, 
+  0x47, 0x44, 0x4b, 0x5f, 0x43, 0x4f, 0x4e, 0x54, 
+  0x52, 0x4f, 0x4c, 0x5f, 0x4d, 0x41, 0x53, 0x4b, 
+  0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 
+  0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 
+  0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 
+  0x65, 0x72, 0x3d, 0x22, 0x73, 0x61, 0x76, 0x65, 
+  0x5f, 0x61, 0x73, 0x5f, 0x66, 0x69, 0x6c, 0x65, 
+  0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 
+  0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 0x5f, 
+  0x63, 0x62, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
+  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 
+  0x6d, 0x61, 0x67, 0x65, 0x4d, 0x65, 0x6e, 0x75, 
+  0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x5f, 
+  0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
+  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
+  0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 
+  0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 
+  0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 
+  0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x4c, 0x61, 
+  0x62, 0x65, 0x6c, 0x20, 0x6f, 0x6e, 0x20, 0x65, 
+  0x6d, 0x61, 0x69, 0x6c, 0x20, 0x6d, 0x65, 0x6e, 
+  0x75, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 
+  0x5f, 0x45, 0x6d, 0x61, 0x69, 0x6c, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 
+  0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 
+  0x6d, 0x61, 0x67, 0x65, 0x22, 0x3e, 0x65, 0x6d, 
+  0x61, 0x69, 0x6c, 0x5f, 0x69, 0x6d, 0x61, 0x67, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 
+  0x73, 0x74, 0x6f, 0x63, 0x6b, 0x22, 0x3e, 0x46, 
+  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x61, 0x63, 0x63, 0x65, 0x6c, 0x65, 0x72, 0x61, 
+  0x74, 0x6f, 0x72, 0x20, 0x6b, 0x65, 0x79, 0x3d, 
+  0x22, 0x65, 0x22, 0x20, 0x73, 0x69, 0x67, 0x6e, 
+  0x61, 0x6c, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 
+  0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 0x6d, 0x6f, 
+  0x64, 0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x3d, 
+  0x22, 0x47, 0x44, 0x4b, 0x5f, 0x43, 0x4f, 0x4e, 
+  0x54, 0x52, 0x4f, 0x4c, 0x5f, 0x4d, 0x41, 0x53, 
+  0x4b, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x69, 0x67, 
+  0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 
+  0x74, 0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 
+  0x6c, 0x65, 0x72, 0x3d, 0x22, 0x65, 0x6d, 0x61, 
+  0x69, 0x6c, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 
+  0x6e, 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 
+  0x64, 0x5f, 0x63, 0x62, 0x22, 0x2f, 0x3e, 0x3c, 
+  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
+  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
+  0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4d, 0x65, 
+  0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, 0x69, 0x6e, 
+  0x74, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 
+  0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 
+  0x6c, 0x22, 0x3e, 0x67, 0x74, 0x6b, 0x2d, 0x70, 
+  0x72, 0x69, 0x6e, 0x74, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
+  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 
+  0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 
+  0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 
+  0x5f, 0x73, 0x74, 0x6f, 0x63, 0x6b, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x61, 0x63, 0x63, 0x65, 0x6c, 0x65, 0x72, 0x61, 
+  0x74, 0x6f, 0x72, 0x20, 0x6b, 0x65, 0x79, 0x3d, 
+  0x22, 0x70, 0x22, 0x20, 0x73, 0x69, 0x67, 0x6e, 
+  0x61, 0x6c, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 
+  0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 0x6d, 0x6f, 
+  0x64, 0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x3d, 
+  0x22, 0x47, 0x44, 0x4b, 0x5f, 0x43, 0x4f, 0x4e, 
+  0x54, 0x52, 0x4f, 0x4c, 0x5f, 0x4d, 0x41, 0x53, 
+  0x4b, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x69, 0x67, 
+  0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 
+  0x74, 0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 
+  0x6c, 0x65, 0x72, 0x3d, 0x22, 0x70, 0x72, 0x69, 
+  0x6e, 0x74, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 
+  0x6e, 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 
+  0x64, 0x5f, 0x63, 0x62, 0x22, 0x2f, 0x3e, 0x3c, 
+  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
+  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
+  0x6b, 0x53, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, 
+  0x6f, 0x72, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 
+  0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
+  0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 
+  0x5f, 0x73, 0x65, 0x70, 0x5f, 0x6d, 0x65, 0x6e, 
+  0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
+  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
+  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
+  0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4d, 0x65, 
+  0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, 0x65, 0x66, 
+  0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x5f, 
+  0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
+  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
+  0x3e, 0x67, 0x74, 0x6b, 0x2d, 0x70, 0x72, 0x65, 
+  0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
+  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 
+  0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x75, 0x73, 0x65, 0x5f, 0x73, 0x74, 0x6f, 
+  0x63, 0x6b, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 
+  0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 
+  0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 
+  0x65, 0x72, 0x3d, 0x22, 0x70, 0x72, 0x65, 0x66, 
+  0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x5f, 
+  0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x63, 
+  0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x63, 
+  0x62, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
+  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x65, 
+  0x70, 0x61, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x4d, 
+  0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x65, 0x70, 
+  0x61, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x6d, 0x65, 
+  0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x31, 0x22, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
+  0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 
+  0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x71, 0x75, 
+  0x69, 0x74, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
+  0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
+  0x65, 0x6c, 0x22, 0x3e, 0x67, 0x74, 0x6b, 0x2d, 
+  0x71, 0x75, 0x69, 0x74, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
+  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 
+  0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 
+  0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 
+  0x5f, 0x73, 0x74, 0x6f, 0x63, 0x6b, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x61, 0x63, 0x63, 0x65, 0x6c, 0x65, 0x72, 0x61, 
+  0x74, 0x6f, 0x72, 0x20, 0x6b, 0x65, 0x79, 0x3d, 
+  0x22, 0x71, 0x22, 0x20, 0x73, 0x69, 0x67, 0x6e, 
+  0x61, 0x6c, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 
+  0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 0x6d, 0x6f, 
+  0x64, 0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x3d, 
+  0x22, 0x47, 0x44, 0x4b, 0x5f, 0x43, 0x4f, 0x4e, 
+  0x54, 0x52, 0x4f, 0x4c, 0x5f, 0x4d, 0x41, 0x53, 
+  0x4b, 0x22, 0x2f, 0x3e, 0x3c, 0x61, 0x63, 0x63, 
+  0x65, 0x6c, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 
+  0x20, 0x6b, 0x65, 0x79, 0x3d, 0x22, 0x77, 0x22, 
+  0x20, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x3d, 
+  0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 
+  0x65, 0x22, 0x20, 0x6d, 0x6f, 0x64, 0x69, 0x66, 
+  0x69, 0x65, 0x72, 0x73, 0x3d, 0x22, 0x47, 0x44, 
+  0x4b, 0x5f, 0x43, 0x4f, 0x4e, 0x54, 0x52, 0x4f, 
+  0x4c, 0x5f, 0x4d, 0x41, 0x53, 0x4b, 0x22, 0x2f, 
+  0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 
+  0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 
+  0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 
+  0x3d, 0x22, 0x71, 0x75, 0x69, 0x74, 0x5f, 0x6d, 
+  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x5f, 
+  0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 
+  0x5f, 0x63, 0x62, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
+  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
+  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
+  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
+  0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 
+  0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
+  0x70, 0x61, 0x67, 0x65, 0x5f, 0x6d, 0x65, 0x6e, 
+  0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
+  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
+  0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 
+  0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 
+  0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 
+  0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 
+  0x73, 0x3d, 0x22, 0x50, 0x61, 0x67, 0x65, 0x20, 
+  0x6d, 0x65, 0x6e, 0x75, 0x20, 0x28, 0x63, 0x6f, 
+  0x6e, 0x74, 0x61, 0x69, 0x6e, 0x73, 0x20, 0x61, 
+  0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x66, 0x6f, 
+  0x72, 0x20, 0x65, 0x61, 0x63, 0x68, 0x20, 0x70, 
+  0x61, 0x67, 0x65, 0x2c, 0x20, 0x65, 0x2e, 0x67, 
+  0x2e, 0x20, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 
+  0x2c, 0x20, 0x63, 0x72, 0x6f, 0x70, 0x29, 0x22, 
+  0x3e, 0x5f, 0x50, 0x61, 0x67, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 
+  0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x74, 0x79, 
+  0x70, 0x65, 0x3d, 0x22, 0x73, 0x75, 0x62, 0x6d, 
+  0x65, 0x6e, 0x75, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
+  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4d, 
+  0x65, 0x6e, 0x75, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x6d, 0x65, 
+  0x6e, 0x75, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
+  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
+  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 
+  0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 
+  0x64, 0x3d, 0x22, 0x72, 0x6f, 0x74, 0x61, 0x74, 
+  0x65, 0x5f, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x6d, 
+  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 
+  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
+  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
+  0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 
+  0x6e, 0x74, 0x73, 0x3d, 0x22, 0x4d, 0x65, 0x6e, 
+  0x75, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x20, 0x74, 
+  0x6f, 0x20, 0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 
+  0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 0x74, 0x6f, 
+  0x20, 0x6c, 0x65, 0x66, 0x74, 0x20, 0x28, 0x61, 
+  0x6e, 0x74, 0x69, 0x2d, 0x63, 0x6c, 0x6f, 0x63, 
+  0x6b, 0x77, 0x69, 0x73, 0x65, 0x29, 0x22, 0x3e, 
+  0x52, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x20, 0x5f, 
+  0x4c, 0x65, 0x66, 0x74, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 
+  0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 
+  0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x63, 
+  0x63, 0x65, 0x6c, 0x65, 0x72, 0x61, 0x74, 0x6f, 
+  0x72, 0x20, 0x6b, 0x65, 0x79, 0x3d, 0x22, 0x62, 
+  0x72, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x6c, 0x65, 
+  0x66, 0x74, 0x22, 0x20, 0x73, 0x69, 0x67, 0x6e, 
+  0x61, 0x6c, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 
+  0x76, 0x61, 0x74, 0x65, 0x22, 0x2f, 0x3e, 0x3c, 
+  0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 
+  0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 0x68, 
+  0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 
+  0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x5f, 0x6c, 
+  0x65, 0x66, 0x74, 0x5f, 0x62, 0x75, 0x74, 0x74, 
+  0x6f, 0x6e, 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 
+  0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x2f, 0x3e, 
+  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
+  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
+  0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 
+  0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
+  0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x5f, 0x72, 
+  0x69, 0x67, 0x68, 0x74, 0x5f, 0x6d, 0x65, 0x6e, 
+  0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
+  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
+  0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 
+  0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 
+  0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 
+  0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 
+  0x73, 0x3d, 0x22, 0x4d, 0x65, 0x6e, 0x75, 0x20, 
+  0x69, 0x74, 0x65, 0x6d, 0x20, 0x74, 0x6f, 0x20, 
+  0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x20, 0x70, 
+  0x61, 0x67, 0x65, 0x20, 0x74, 0x6f, 0x20, 0x72, 
+  0x69, 0x67, 0x68, 0x74, 0x20, 0x28, 0x63, 0x6c, 
+  0x6f, 0x63, 0x6b, 0x77, 0x69, 0x73, 0x65, 0x29, 
+  0x22, 0x3e, 0x52, 0x6f, 0x74, 0x61, 0x74, 0x65, 
+  0x20, 0x5f, 0x52, 0x69, 0x67, 0x68, 0x74, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 
+  0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x61, 0x63, 0x63, 0x65, 0x6c, 0x65, 0x72, 
+  0x61, 0x74, 0x6f, 0x72, 0x20, 0x6b, 0x65, 0x79, 
+  0x3d, 0x22, 0x62, 0x72, 0x61, 0x63, 0x6b, 0x65, 
+  0x74, 0x72, 0x69, 0x67, 0x68, 0x74, 0x22, 0x20, 
+  0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x3d, 0x22, 
+  0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 
+  0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 
+  0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 
+  0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 
+  0x65, 0x72, 0x3d, 0x22, 0x72, 0x6f, 0x74, 0x61, 
+  0x74, 0x65, 0x5f, 0x72, 0x69, 0x67, 0x68, 0x74, 
+  0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 
+  0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 0x5f, 
+  0x63, 0x62, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
+  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4d, 
+  0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 0x72, 0x6f, 
+  0x70, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 
+  0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
+  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 
+  0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 
+  0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 
+  0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 
+  0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 
+  0x4c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x66, 0x6f, 
+  0x72, 0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 0x63, 
+  0x72, 0x6f, 0x70, 0x20, 0x73, 0x75, 0x62, 0x6d, 
+  0x65, 0x6e, 0x75, 0x22, 0x3e, 0x5f, 0x43, 0x72, 
+  0x6f, 0x70, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 
+  0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 
+  0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 
+  0x73, 0x75, 0x62, 0x6d, 0x65, 0x6e, 0x75, 0x22, 
+  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
+  0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x22, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 0x72, 0x6f, 
+  0x70, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x22, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
+  0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x4d, 0x65, 
+  0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x5f, 0x63, 
+  0x72, 0x6f, 0x70, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
+  0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
+  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 
+  0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 
+  0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 
+  0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 
+  0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 
+  0x3d, 0x22, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x20, 
+  0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x20, 0x66, 
+  0x6f, 0x72, 0x20, 0x6e, 0x6f, 0x20, 0x63, 0x72, 
+  0x6f, 0x70, 0x22, 0x3e, 0x5f, 0x4e, 0x6f, 0x6e, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 
+  0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 
+  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x61, 0x73, 
+  0x5f, 0x72, 0x61, 0x64, 0x69, 0x6f, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x67, 
+  0x67, 0x6c, 0x65, 0x64, 0x22, 0x20, 0x68, 0x61, 
+  0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x6e, 
+  0x6f, 0x5f, 0x63, 0x72, 0x6f, 0x70, 0x5f, 0x6d, 
+  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x5f, 
+  0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x64, 0x5f, 
+  0x63, 0x62, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
+  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x52, 
+  0x61, 0x64, 0x69, 0x6f, 0x4d, 0x65, 0x6e, 0x75, 
+  0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x61, 0x34, 0x5f, 0x6d, 0x65, 0x6e, 
+  0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
+  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
+  0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 
+  0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 
+  0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 
+  0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 
+  0x73, 0x3d, 0x22, 0x52, 0x61, 0x64, 0x69, 0x6f, 
+  0x20, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x20, 
+  0x66, 0x6f, 0x72, 0x20, 0x63, 0x72, 0x6f, 0x70, 
+  0x70, 0x69, 0x6e, 0x67, 0x20, 0x70, 0x61, 0x67, 
+  0x65, 0x20, 0x74, 0x6f, 0x20, 0x41, 0x34, 0x20, 
+  0x73, 0x69, 0x7a, 0x65, 0x22, 0x3e, 0x41, 0x5f, 
+  0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 
+  0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 
+  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x61, 
+  0x73, 0x5f, 0x72, 0x61, 0x64, 0x69, 0x6f, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 0x3e, 0x6e, 
+  0x6f, 0x5f, 0x63, 0x72, 0x6f, 0x70, 0x5f, 0x6d, 
+  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 
+  0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x64, 0x22, 
+  0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 
+  0x3d, 0x22, 0x61, 0x34, 0x5f, 0x6d, 0x65, 0x6e, 
+  0x75, 0x69, 0x74, 0x65, 0x6d, 0x5f, 0x74, 0x6f, 
+  0x67, 0x67, 0x6c, 0x65, 0x64, 0x5f, 0x63, 0x62, 
+  0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
+  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x52, 0x61, 0x64, 
+  0x69, 0x6f, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 
+  0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
+  0x61, 0x35, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
+  0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
+  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
+  0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
+  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
+  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 
+  0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 
+  0x22, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x20, 0x62, 
+  0x75, 0x74, 0x74, 0x6f, 0x6e, 0x20, 0x66, 0x6f, 
+  0x72, 0x20, 0x63, 0x72, 0x6f, 0x70, 0x70, 0x69, 
+  0x6e, 0x67, 0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 
+  0x74, 0x6f, 0x20, 0x41, 0x35, 0x20, 0x73, 0x69, 
+  0x7a, 0x65, 0x22, 0x3e, 0x41, 0x5f, 0x35, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 
+  0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x64, 0x72, 0x61, 0x77, 0x5f, 0x61, 0x73, 0x5f, 
+  0x72, 0x61, 0x64, 0x69, 0x6f, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x67, 0x72, 
+  0x6f, 0x75, 0x70, 0x22, 0x3e, 0x6e, 0x6f, 0x5f, 
+  0x63, 0x72, 0x6f, 0x70, 0x5f, 0x6d, 0x65, 0x6e, 
+  0x75, 0x69, 0x74, 0x65, 0x6d, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 
+  0x67, 0x67, 0x6c, 0x65, 0x64, 0x22, 0x20, 0x68, 
+  0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 
+  0x61, 0x35, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
+  0x74, 0x65, 0x6d, 0x5f, 0x74, 0x6f, 0x67, 0x67, 
+  0x6c, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x2f, 
+  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
+  0x47, 0x74, 0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, 
+  0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x36, 
+  0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
+  0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
+  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 
+  0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 
+  0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 
+  0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 
+  0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x52, 
+  0x61, 0x64, 0x69, 0x6f, 0x20, 0x62, 0x75, 0x74, 
+  0x74, 0x6f, 0x6e, 0x20, 0x66, 0x6f, 0x72, 0x20, 
+  0x63, 0x72, 0x6f, 0x70, 0x70, 0x69, 0x6e, 0x67, 
+  0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 0x74, 0x6f, 
+  0x20, 0x41, 0x36, 0x20, 0x73, 0x69, 0x7a, 0x65, 
+  0x22, 0x3e, 0x41, 0x5f, 0x36, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 
+  0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, 
+  0x61, 0x77, 0x5f, 0x61, 0x73, 0x5f, 0x72, 0x61, 
+  0x64, 0x69, 0x6f, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x67, 0x72, 0x6f, 0x75, 
+  0x70, 0x22, 0x3e, 0x6e, 0x6f, 0x5f, 0x63, 0x72, 
+  0x6f, 0x70, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
+  0x74, 0x65, 0x6d, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 
+  0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x67, 0x67, 
+  0x6c, 0x65, 0x64, 0x22, 0x20, 0x68, 0x61, 0x6e, 
+  0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x61, 0x36, 
+  0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
+  0x6d, 0x5f, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 
+  0x64, 0x5f, 0x63, 0x62, 0x22, 0x2f, 0x3e, 0x3c, 
+  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
+  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
+  0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x4d, 0x65, 
+  0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x6c, 0x65, 0x74, 0x74, 
+  0x65, 0x72, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
+  0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
+  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
+  0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
+  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
+  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 
+  0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 
+  0x22, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x20, 0x62, 
+  0x75, 0x74, 0x74, 0x6f, 0x6e, 0x20, 0x66, 0x6f, 
+  0x72, 0x20, 0x63, 0x72, 0x6f, 0x70, 0x70, 0x69, 
+  0x6e, 0x67, 0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 
+  0x74, 0x6f, 0x20, 0x55, 0x53, 0x20, 0x6c, 0x65, 
+  0x74, 0x74, 0x65, 0x72, 0x20, 0x73, 0x69, 0x7a, 
+  0x65, 0x22, 0x3e, 0x5f, 0x4c, 0x65, 0x74, 0x74, 
+  0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 
+  0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 
+  0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, 
+  0x61, 0x73, 0x5f, 0x72, 0x61, 0x64, 0x69, 0x6f, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 0x3e, 
+  0x6e, 0x6f, 0x5f, 0x63, 0x72, 0x6f, 0x70, 0x5f, 
+  0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 
+  0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x64, 
+  0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 
+  0x72, 0x3d, 0x22, 0x6c, 0x65, 0x74, 0x74, 0x65, 
+  0x72, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 
+  0x65, 0x6d, 0x5f, 0x74, 0x6f, 0x67, 0x67, 0x6c, 
+  0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x2f, 0x3e, 
+  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
+  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
+  0x74, 0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x4d, 
+  0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x65, 0x67, 
+  0x61, 0x6c, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
+  0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
+  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
+  0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
+  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
+  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 
+  0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 
+  0x22, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x20, 0x62, 
+  0x75, 0x74, 0x74, 0x6f, 0x6e, 0x20, 0x66, 0x6f, 
+  0x72, 0x20, 0x63, 0x72, 0x6f, 0x70, 0x70, 0x69, 
+  0x6e, 0x67, 0x20, 0x74, 0x6f, 0x20, 0x70, 0x61, 
+  0x67, 0x65, 0x20, 0x74, 0x6f, 0x20, 0x55, 0x53, 
+  0x20, 0x6c, 0x65, 0x67, 0x61, 0x6c, 0x20, 0x73, 
+  0x69, 0x7a, 0x65, 0x22, 0x3e, 0x4c, 0x65, 0x5f, 
+  0x67, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 
+  0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 
+  0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, 
+  0x5f, 0x61, 0x73, 0x5f, 0x72, 0x61, 0x64, 0x69, 
+  0x6f, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 
+  0x3e, 0x6e, 0x6f, 0x5f, 0x63, 0x72, 0x6f, 0x70, 
+  0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
+  0x6d, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 
+  0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 
+  0x64, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 
+  0x65, 0x72, 0x3d, 0x22, 0x6c, 0x65, 0x67, 0x61, 
+  0x6c, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 
+  0x65, 0x6d, 0x5f, 0x74, 0x6f, 0x67, 0x67, 0x6c, 
+  0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x2f, 0x3e, 
+  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
+  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
+  0x74, 0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x4d, 
+  0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x34, 0x78, 0x36, 
+  0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
+  0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
+  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 
+  0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 
+  0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 
+  0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 
+  0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x52, 
+  0x61, 0x64, 0x69, 0x6f, 0x20, 0x62, 0x75, 0x74, 
+  0x74, 0x6f, 0x6e, 0x20, 0x66, 0x6f, 0x72, 0x20, 
+  0x63, 0x72, 0x6f, 0x70, 0x70, 0x69, 0x6e, 0x67, 
+  0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 0x74, 0x6f, 
+  0x20, 0x34, 0x78, 0x36, 0x20, 0x69, 0x6e, 0x63, 
+  0x68, 0x22, 0x3e, 0x34, 0x26, 0x23, 0x78, 0x44, 
+  0x37, 0x3b, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 
+  0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 
+  0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, 
+  0x5f, 0x61, 0x73, 0x5f, 0x72, 0x61, 0x64, 0x69, 
+  0x6f, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 
+  0x3e, 0x6e, 0x6f, 0x5f, 0x63, 0x72, 0x6f, 0x70, 
+  0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
+  0x6d, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 
+  0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 
+  0x64, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 
+  0x65, 0x72, 0x3d, 0x22, 0x66, 0x6f, 0x75, 0x72, 
+  0x5f, 0x62, 0x79, 0x5f, 0x73, 0x69, 0x78, 0x5f, 
+  0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
+  0x5f, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x64, 
+  0x5f, 0x63, 0x62, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
+  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
+  0x52, 0x61, 0x64, 0x69, 0x6f, 0x4d, 0x65, 0x6e, 
+  0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 
+  0x64, 0x3d, 0x22, 0x63, 0x75, 0x73, 0x74, 0x6f, 
+  0x6d, 0x5f, 0x63, 0x72, 0x6f, 0x70, 0x5f, 0x6d, 
+  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 
+  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
+  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
+  0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 
+  0x6e, 0x74, 0x73, 0x3d, 0x22, 0x52, 0x61, 0x64, 
+  0x69, 0x6f, 0x20, 0x62, 0x75, 0x74, 0x74, 0x6f, 
+  0x6e, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x63, 0x72, 
+  0x6f, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x20, 0x74, 
+  0x6f, 0x20, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 
+  0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 0x73, 0x69, 
+  0x7a, 0x65, 0x22, 0x3e, 0x5f, 0x43, 0x75, 0x73, 
+  0x74, 0x6f, 0x6d, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 
+  0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 
+  0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, 
+  0x5f, 0x61, 0x73, 0x5f, 0x72, 0x61, 0x64, 0x69, 
+  0x6f, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 
+  0x3e, 0x6e, 0x6f, 0x5f, 0x63, 0x72, 0x6f, 0x70, 
+  0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
+  0x6d, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 
+  0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 
+  0x64, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 
+  0x65, 0x72, 0x3d, 0x22, 0x63, 0x75, 0x73, 0x74, 
+  0x6f, 0x6d, 0x5f, 0x63, 0x72, 0x6f, 0x70, 0x5f, 
+  0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
+  0x5f, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x64, 
+  0x5f, 0x63, 0x62, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
+  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
+  0x53, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, 0x6f, 
+  0x72, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 
+  0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 
+  0x72, 0x6f, 0x70, 0x5f, 0x73, 0x65, 0x70, 0x5f, 
+  0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
+  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 
+  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
+  0x22, 0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 
+  0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x63, 0x72, 0x6f, 0x70, 0x5f, 0x72, 
+  0x6f, 0x74, 0x61, 0x74, 0x65, 0x5f, 0x6d, 0x65, 
+  0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x73, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 
+  0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 
+  0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 
+  0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 
+  0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 
+  0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x4d, 
+  0x65, 0x6e, 0x75, 0x20, 0x69, 0x74, 0x65, 0x6d, 
+  0x20, 0x74, 0x6f, 0x20, 0x72, 0x6f, 0x74, 0x61, 
+  0x74, 0x65, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 
+  0x72, 0x6f, 0x70, 0x20, 0x61, 0x72, 0x65, 0x61, 
+  0x22, 0x3e, 0x5f, 0x52, 0x6f, 0x74, 0x61, 0x74, 
+  0x65, 0x20, 0x43, 0x72, 0x6f, 0x70, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 
+  0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 
+  0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 0x68, 
+  0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 
+  0x63, 0x72, 0x6f, 0x70, 0x5f, 0x72, 0x6f, 0x74, 
+  0x61, 0x74, 0x65, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
+  0x69, 0x74, 0x65, 0x6d, 0x5f, 0x61, 0x63, 0x74, 
+  0x69, 0x76, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x62, 
+  0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
+  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4d, 
+  0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x61, 0x67, 
+  0x65, 0x5f, 0x6d, 0x6f, 0x76, 0x65, 0x5f, 0x6c, 
+  0x65, 0x66, 0x74, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
+  0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
+  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 
+  0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 
+  0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 
+  0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 
+  0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 
+  0x3d, 0x22, 0x4d, 0x65, 0x6e, 0x75, 0x20, 0x69, 
+  0x74, 0x65, 0x6d, 0x20, 0x74, 0x6f, 0x20, 0x6d, 
+  0x6f, 0x76, 0x65, 0x20, 0x74, 0x68, 0x65, 0x20, 
+  0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x65, 0x64, 
+  0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 0x74, 0x6f, 
+  0x20, 0x74, 0x68, 0x65, 0x20, 0x6c, 0x65, 0x66, 
+  0x74, 0x22, 0x3e, 0x4d, 0x6f, 0x76, 0x65, 0x20, 
+  0x4c, 0x65, 0x66, 0x74, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x61, 0x63, 0x63, 0x65, 0x6c, 0x65, 0x72, 0x61, 
+  0x74, 0x6f, 0x72, 0x20, 0x6b, 0x65, 0x79, 0x3d, 
+  0x22, 0x6c, 0x65, 0x73, 0x73, 0x22, 0x20, 0x73, 
+  0x69, 0x67, 0x6e, 0x61, 0x6c, 0x3d, 0x22, 0x61, 
+  0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 
+  0x2f, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 
+  0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 
+  0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 
+  0x72, 0x3d, 0x22, 0x70, 0x61, 0x67, 0x65, 0x5f, 
+  0x6d, 0x6f, 0x76, 0x65, 0x5f, 0x6c, 0x65, 0x66, 
+  0x74, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 
+  0x65, 0x6d, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x76, 
+  0x61, 0x74, 0x65, 0x5f, 0x63, 0x62, 0x22, 0x2f, 
+  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
+  0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x49, 
+  0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x6d, 0x6f, 
+  0x76, 0x65, 0x5f, 0x72, 0x69, 0x67, 0x68, 0x74, 
+  0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
+  0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
+  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 
+  0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 
+  0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 
+  0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 
+  0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x4d, 
+  0x65, 0x6e, 0x75, 0x20, 0x69, 0x74, 0x65, 0x6d, 
+  0x20, 0x74, 0x6f, 0x20, 0x6d, 0x6f, 0x76, 0x65, 
+  0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 0x65, 0x6c, 
+  0x65, 0x63, 0x74, 0x65, 0x64, 0x20, 0x70, 0x61, 
+  0x67, 0x65, 0x20, 0x74, 0x6f, 0x20, 0x74, 0x68, 
+  0x65, 0x20, 0x72, 0x69, 0x67, 0x68, 0x74, 0x22, 
+  0x3e, 0x4d, 0x6f, 0x76, 0x65, 0x20, 0x52, 0x69, 
+  0x67, 0x68, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 
+  0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 
+  0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x63, 0x63, 
+  0x65, 0x6c, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 
+  0x20, 0x6b, 0x65, 0x79, 0x3d, 0x22, 0x67, 0x72, 
+  0x65, 0x61, 0x74, 0x65, 0x72, 0x22, 0x20, 0x73, 
+  0x69, 0x67, 0x6e, 0x61, 0x6c, 0x3d, 0x22, 0x61, 
+  0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 
+  0x2f, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 
+  0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 
+  0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 
+  0x72, 0x3d, 0x22, 0x70, 0x61, 0x67, 0x65, 0x5f, 
+  0x6d, 0x6f, 0x76, 0x65, 0x5f, 0x72, 0x69, 0x67, 
+  0x68, 0x74, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
+  0x74, 0x65, 0x6d, 0x5f, 0x61, 0x63, 0x74, 0x69, 
+  0x76, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x62, 0x22, 
+  0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
+  0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, 
+  0x65, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 
+  0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 
+  0x6f, 0x70, 0x79, 0x5f, 0x74, 0x6f, 0x5f, 0x63, 
+  0x6c, 0x69, 0x70, 0x62, 0x6f, 0x61, 0x72, 0x64, 
+  0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
+  0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 
+  0x22, 0x3e, 0x67, 0x74, 0x6b, 0x2d, 0x63, 0x6f, 
+  0x70, 0x79, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
+  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x65, 0x6e, 
+  0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x22, 0x3e, 
+  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 
+  0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 
+  0x65, 0x5f, 0x73, 0x74, 0x6f, 0x63, 0x6b, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x61, 0x63, 0x63, 0x65, 0x6c, 0x65, 0x72, 
+  0x61, 0x74, 0x6f, 0x72, 0x20, 0x6b, 0x65, 0x79, 
+  0x3d, 0x22, 0x63, 0x22, 0x20, 0x73, 0x69, 0x67, 
+  0x6e, 0x61, 0x6c, 0x3d, 0x22, 0x61, 0x63, 0x74, 
+  0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 0x6d, 
+  0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 
+  0x3d, 0x22, 0x47, 0x44, 0x4b, 0x5f, 0x43, 0x4f, 
+  0x4e, 0x54, 0x52, 0x4f, 0x4c, 0x5f, 0x4d, 0x41, 
+  0x53, 0x4b, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x69, 
+  0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 
+  0x61, 0x74, 0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 
+  0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x63, 0x6f, 
+  0x70, 0x79, 0x5f, 0x74, 0x6f, 0x5f, 0x63, 0x6c, 
+  0x69, 0x70, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x5f, 
+  0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x63, 
+  0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x63, 
+  0x62, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
+  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, 
+  0x61, 0x67, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x49, 
+  0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x64, 0x65, 
+  0x6c, 0x65, 0x74, 0x65, 0x5f, 0x6d, 0x65, 0x6e, 
+  0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
+  0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x67, 0x74, 
+  0x6b, 0x2d, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
+  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 
+  0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x75, 0x73, 0x65, 0x5f, 0x73, 0x74, 0x6f, 
+  0x63, 0x6b, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x61, 0x63, 0x63, 0x65, 
+  0x6c, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, 
+  0x6b, 0x65, 0x79, 0x3d, 0x22, 0x44, 0x65, 0x6c, 
+  0x65, 0x74, 0x65, 0x22, 0x20, 0x73, 0x69, 0x67, 
+  0x6e, 0x61, 0x6c, 0x3d, 0x22, 0x61, 0x63, 0x74, 
+  0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x2f, 0x3e, 
+  0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 
+  0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 
+  0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 
+  0x22, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x64, 0x65, 
+  0x6c, 0x65, 0x74, 0x65, 0x5f, 0x6d, 0x65, 0x6e, 
+  0x75, 0x69, 0x74, 0x65, 0x6d, 0x5f, 0x61, 0x63, 
+  0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x5f, 0x63, 
+  0x62, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
+  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
+  0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x68, 0x65, 
+  0x6c, 0x70, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
+  0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
+  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
+  0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
+  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
+  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 
+  0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 
+  0x22, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x6f, 
+  0x6e, 0x20, 0x68, 0x65, 0x6c, 0x70, 0x20, 0x6d, 
+  0x65, 0x6e, 0x75, 0x22, 0x3e, 0x5f, 0x48, 0x65, 
+  0x6c, 0x70, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 
+  0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 
+  0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 
+  0x73, 0x75, 0x62, 0x6d, 0x65, 0x6e, 0x75, 0x22, 
+  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
+  0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x22, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x68, 0x65, 0x6c, 
+  0x70, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x22, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
+  0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4d, 0x65, 
+  0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x68, 0x65, 0x6c, 0x70, 
+  0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 
+  0x73, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 
+  0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 
+  0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 
+  0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 
+  0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 
+  0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 
+  0x48, 0x65, 0x6c, 0x70, 0x7c, 0x43, 0x6f, 0x6e, 
+  0x74, 0x65, 0x6e, 0x74, 0x73, 0x20, 0x6d, 0x65, 
+  0x6e, 0x75, 0x22, 0x3e, 0x5f, 0x43, 0x6f, 0x6e, 
+  0x74, 0x65, 0x6e, 0x74, 0x73, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 
+  0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x6d, 
+  0x61, 0x67, 0x65, 0x22, 0x3e, 0x68, 0x65, 0x6c, 
+  0x70, 0x5f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x73, 0x74, 
+  0x6f, 0x63, 0x6b, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
+  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x63, 
+  0x63, 0x65, 0x6c, 0x65, 0x72, 0x61, 0x74, 0x6f, 
+  0x72, 0x20, 0x6b, 0x65, 0x79, 0x3d, 0x22, 0x46, 
+  0x31, 0x22, 0x20, 0x73, 0x69, 0x67, 0x6e, 0x61, 
+  0x6c, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 
+  0x61, 0x74, 0x65, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 
+  0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 
+  0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 0x68, 0x61, 
+  0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x68, 
+  0x65, 0x6c, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 
+  0x65, 0x6e, 0x74, 0x73, 0x5f, 0x6d, 0x65, 0x6e, 
+  0x75, 0x69, 0x74, 0x65, 0x6d, 0x5f, 0x61, 0x63, 
+  0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x5f, 0x63, 
+  0x62, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
+  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, 
+  0x61, 0x67, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x49, 
+  0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x61, 0x62, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 
+  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 
+  0x67, 0x74, 0x6b, 0x2d, 0x61, 0x62, 0x6f, 0x75, 
+  0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
+  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 
+  0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 
+  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x73, 0x74, 
+  0x6f, 0x63, 0x6b, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 
+  0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 
+  0x74, 0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 
+  0x6c, 0x65, 0x72, 0x3d, 0x22, 0x61, 0x62, 0x6f, 
+  0x75, 0x74, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
+  0x74, 0x65, 0x6d, 0x5f, 0x61, 0x63, 0x74, 0x69, 
+  0x76, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x62, 0x22, 
+  0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 
+  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 
+  0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 
+  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 
+  0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 
+  0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 
+  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
+  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
+  0x54, 0x6f, 0x6f, 0x6c, 0x62, 0x61, 0x72, 0x22, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x6f, 0x6f, 
+  0x6c, 0x62, 0x61, 0x72, 0x31, 0x22, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
+  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x70, 0x72, 0x69, 0x6d, 0x61, 
+  0x72, 0x79, 0x2d, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 
+  0x61, 0x72, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 
+  0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
+  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, 0x6f, 
+  0x6f, 0x6c, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6e, 0x65, 
+  0x77, 0x5f, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x75, 
+  0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
+  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 
+  0x6f, 0x6c, 0x74, 0x69, 0x70, 0x5f, 0x74, 0x65, 
+  0x78, 0x74, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
+  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
+  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 
+  0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 
+  0x22, 0x54, 0x6f, 0x6f, 0x6c, 0x74, 0x69, 0x70, 
+  0x20, 0x66, 0x6f, 0x72, 0x20, 0x6e, 0x65, 0x77, 
+  0x20, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 
+  0x74, 0x20, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
+  0x22, 0x3e, 0x53, 0x74, 0x61, 0x72, 0x74, 0x20, 
+  0x61, 0x20, 0x6e, 0x65, 0x77, 0x20, 0x64, 0x6f, 
+  0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 
+  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
+  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
+  0x73, 0x22, 0x3e, 0x4e, 0x65, 0x77, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 
+  0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 
+  0x74, 0x6f, 0x63, 0x6b, 0x5f, 0x69, 0x64, 0x22, 
+  0x3e, 0x67, 0x74, 0x6b, 0x2d, 0x6e, 0x65, 0x77, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 
+  0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 
+  0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 
+  0x72, 0x3d, 0x22, 0x6e, 0x65, 0x77, 0x5f, 0x62, 
+  0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x63, 0x6c, 
+  0x69, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x63, 0x62, 
+  0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 
+  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 
+  0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
+  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x6f, 0x6d, 
+  0x6f, 0x67, 0x65, 0x6e, 0x65, 0x6f, 0x75, 0x73, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 
+  0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
+  0x22, 0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 
+  0x54, 0x6f, 0x6f, 0x6c, 0x42, 0x75, 0x74, 0x74, 
+  0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
+  0x73, 0x63, 0x61, 0x6e, 0x5f, 0x74, 0x6f, 0x6f, 
+  0x6c, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x74, 0x6f, 0x6f, 0x6c, 0x74, 0x69, 0x70, 
+  0x5f, 0x74, 0x65, 0x78, 0x74, 0x22, 0x20, 0x74, 
+  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
+  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
+  0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 
+  0x74, 0x73, 0x3d, 0x22, 0x54, 0x6f, 0x6f, 0x6c, 
+  0x74, 0x69, 0x70, 0x20, 0x66, 0x6f, 0x72, 0x20, 
+  0x73, 0x63, 0x61, 0x6e, 0x20, 0x74, 0x6f, 0x6f, 
+  0x6c, 0x62, 0x61, 0x72, 0x20, 0x62, 0x75, 0x74, 
+  0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x53, 0x63, 0x61, 
+  0x6e, 0x20, 0x61, 0x20, 0x73, 0x69, 0x6e, 0x67, 
+  0x6c, 0x65, 0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 
+  0x66, 0x72, 0x6f, 0x6d, 0x20, 0x74, 0x68, 0x65, 
+  0x20, 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x65, 0x72, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x69, 0x73, 0x5f, 0x69, 0x6d, 
+  0x70, 0x6f, 0x72, 0x74, 0x61, 0x6e, 0x74, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 
+  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
+  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
+  0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 
+  0x74, 0x73, 0x3d, 0x22, 0x4c, 0x61, 0x62, 0x65, 
+  0x6c, 0x20, 0x6f, 0x6e, 0x20, 0x73, 0x63, 0x61, 
+  0x6e, 0x20, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x61, 
+  0x72, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 
+  0x53, 0x63, 0x61, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 
+  0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 
+  0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 
+  0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 
+  0x73, 0x63, 0x61, 0x6e, 0x6e, 0x65, 0x72, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x6d, 0x65, 0x6e, 0x75, 0x22, 0x3e, 
+  0x73, 0x63, 0x61, 0x6e, 0x5f, 0x74, 0x6f, 0x6f, 
+  0x6c, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 
+  0x6d, 0x65, 0x6e, 0x75, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6c, 0x69, 
+  0x63, 0x6b, 0x65, 0x64, 0x22, 0x20, 0x68, 0x61, 
+  0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x73, 
+  0x63, 0x61, 0x6e, 0x5f, 0x62, 0x75, 0x74, 0x74, 
+  0x6f, 0x6e, 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 
+  0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x2f, 0x3e, 
+  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
+  0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 
+  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 
+  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
+  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, 0x6f, 0x6f, 
+  0x6c, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x61, 0x76, 
+  0x65, 0x5f, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x75, 
+  0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
+  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x65, 
+  0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x22, 
+  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x74, 0x6f, 0x6f, 0x6c, 0x74, 0x69, 0x70, 
+  0x5f, 0x74, 0x65, 0x78, 0x74, 0x22, 0x20, 0x74, 
+  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
+  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
+  0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 
+  0x74, 0x73, 0x3d, 0x22, 0x54, 0x6f, 0x6f, 0x6c, 
+  0x74, 0x69, 0x70, 0x20, 0x66, 0x6f, 0x72, 0x20, 
+  0x73, 0x61, 0x76, 0x65, 0x20, 0x74, 0x6f, 0x6f, 
+  0x6c, 0x62, 0x61, 0x72, 0x20, 0x62, 0x75, 0x74, 
+  0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x53, 0x61, 0x76, 
+  0x65, 0x20, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 
+  0x6e, 0x74, 0x20, 0x74, 0x6f, 0x20, 0x61, 0x20, 
+  0x66, 0x69, 0x6c, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 
+  0x73, 0x5f, 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 
+  0x61, 0x6e, 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 
+  0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 
+  0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 
+  0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x53, 0x61, 
+  0x76, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 
+  0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 
+  0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x73, 0x74, 0x6f, 0x63, 0x6b, 
+  0x5f, 0x69, 0x64, 0x22, 0x3e, 0x67, 0x74, 0x6b, 
+  0x2d, 0x73, 0x61, 0x76, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6c, 
+  0x69, 0x63, 0x6b, 0x65, 0x64, 0x22, 0x20, 0x68, 
+  0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 
+  0x73, 0x61, 0x76, 0x65, 0x5f, 0x66, 0x69, 0x6c, 
+  0x65, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
+  0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 
+  0x5f, 0x63, 0x62, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
+  0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 
+  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x68, 0x6f, 0x6d, 0x6f, 0x67, 0x65, 0x6e, 0x65, 
+  0x6f, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 
+  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
+  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, 
+  0x6f, 0x6f, 0x6c, 0x42, 0x75, 0x74, 0x74, 0x6f, 
+  0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 
+  0x74, 0x6f, 0x70, 0x5f, 0x74, 0x6f, 0x6f, 0x6c, 
+  0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x73, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 
+  0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x74, 0x6f, 0x6f, 0x6c, 0x74, 
+  0x69, 0x70, 0x5f, 0x74, 0x65, 0x78, 0x74, 0x22, 
+  0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 
+  0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 
+  0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 
+  0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x54, 0x6f, 
+  0x6f, 0x6c, 0x74, 0x69, 0x70, 0x20, 0x66, 0x6f, 
+  0x72, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x62, 
+  0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x53, 
+  0x74, 0x6f, 0x70, 0x20, 0x74, 0x68, 0x65, 0x20, 
+  0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x20, 
+  0x73, 0x63, 0x61, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
+  0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 
+  0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 
+  0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 
+  0x3e, 0x53, 0x74, 0x6f, 0x70, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 
+  0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x74, 
+  0x6f, 0x63, 0x6b, 0x5f, 0x69, 0x64, 0x22, 0x3e, 
+  0x67, 0x74, 0x6b, 0x2d, 0x73, 0x74, 0x6f, 0x70, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 
+  0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 
+  0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 
+  0x72, 0x3d, 0x22, 0x73, 0x74, 0x6f, 0x70, 0x5f, 
+  0x73, 0x63, 0x61, 0x6e, 0x5f, 0x62, 0x75, 0x74, 
+  0x74, 0x6f, 0x6e, 0x5f, 0x63, 0x6c, 0x69, 0x63, 
+  0x6b, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x2f, 
+  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 
+  0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 
+  0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x68, 0x6f, 0x6d, 0x6f, 0x67, 
+  0x65, 0x6e, 0x65, 0x6f, 0x75, 0x73, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
+  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
+  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
+  0x74, 0x6b, 0x53, 0x65, 0x70, 0x61, 0x72, 0x61, 
+  0x74, 0x6f, 0x72, 0x54, 0x6f, 0x6f, 0x6c, 0x49, 
+  0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x75, 0x74, 
+  0x74, 0x6f, 0x6e, 0x32, 0x22, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
+  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
+  0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 
+  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x68, 0x6f, 0x6d, 0x6f, 0x67, 0x65, 0x6e, 0x65, 
+  0x6f, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 
+  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
+  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, 
+  0x6f, 0x6f, 0x6c, 0x42, 0x75, 0x74, 0x74, 0x6f, 
+  0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 
+  0x6f, 0x74, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x65, 
+  0x66, 0x74, 0x5f, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 
+  0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
+  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 
+  0x6f, 0x6f, 0x6c, 0x74, 0x69, 0x70, 0x5f, 0x74, 
+  0x65, 0x78, 0x74, 0x22, 0x20, 0x74, 0x72, 0x61, 
+  0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 
+  0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 
+  0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 
+  0x3d, 0x22, 0x54, 0x6f, 0x6f, 0x6c, 0x74, 0x69, 
+  0x70, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x72, 0x6f, 
+  0x74, 0x61, 0x74, 0x65, 0x20, 0x6c, 0x65, 0x66, 
+  0x74, 0x20, 0x28, 0x63, 0x6f, 0x75, 0x6e, 0x74, 
+  0x65, 0x72, 0x2d, 0x63, 0x6c, 0x6f, 0x63, 0x6b, 
+  0x77, 0x69, 0x73, 0x65, 0x29, 0x20, 0x62, 0x75, 
+  0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x52, 0x6f, 
+  0x74, 0x61, 0x74, 0x65, 0x20, 0x74, 0x68, 0x65, 
+  0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 0x74, 0x6f, 
+  0x20, 0x74, 0x68, 0x65, 0x20, 0x6c, 0x65, 0x66, 
+  0x74, 0x20, 0x28, 0x63, 0x6f, 0x75, 0x6e, 0x74, 
+  0x65, 0x72, 0x2d, 0x63, 0x6c, 0x6f, 0x63, 0x6b, 
+  0x77, 0x69, 0x73, 0x65, 0x29, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 
+  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
+  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
+  0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 
+  0x74, 0x73, 0x3d, 0x22, 0x4c, 0x61, 0x62, 0x65, 
+  0x6c, 0x20, 0x6f, 0x6e, 0x20, 0x72, 0x6f, 0x74, 
+  0x61, 0x74, 0x65, 0x20, 0x70, 0x61, 0x67, 0x65, 
+  0x20, 0x6c, 0x65, 0x66, 0x74, 0x20, 0x28, 0x61, 
+  0x6e, 0x74, 0x69, 0x2d, 0x63, 0x6c, 0x6f, 0x63, 
+  0x6b, 0x77, 0x69, 0x73, 0x65, 0x29, 0x20, 0x69, 
+  0x74, 0x65, 0x6d, 0x22, 0x3e, 0x52, 0x6f, 0x74, 
+  0x61, 0x74, 0x65, 0x20, 0x4c, 0x65, 0x66, 0x74, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 
+  0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 
+  0x6d, 0x65, 0x22, 0x3e, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x2d, 0x72, 0x6f, 0x74, 0x61, 0x74, 
+  0x65, 0x2d, 0x6c, 0x65, 0x66, 0x74, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 
+  0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 0x22, 0x20, 
+  0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 
+  0x22, 0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x5f, 
+  0x6c, 0x65, 0x66, 0x74, 0x5f, 0x62, 0x75, 0x74, 
+  0x74, 0x6f, 0x6e, 0x5f, 0x63, 0x6c, 0x69, 0x63, 
+  0x6b, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x2f, 
+  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 
+  0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 
+  0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x68, 0x6f, 0x6d, 0x6f, 0x67, 
+  0x65, 0x6e, 0x65, 0x6f, 0x75, 0x73, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
+  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
+  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
+  0x74, 0x6b, 0x54, 0x6f, 0x6f, 0x6c, 0x42, 0x75, 
+  0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 
+  0x5f, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x74, 
+  0x6f, 0x6f, 0x6c, 0x62, 0x75, 0x74, 0x74, 0x6f, 
+  0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
+  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x74, 0x6f, 0x6f, 0x6c, 0x74, 
+  0x69, 0x70, 0x5f, 0x74, 0x65, 0x78, 0x74, 0x22, 
+  0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 
+  0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 
+  0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 
+  0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x54, 0x6f, 
+  0x6f, 0x6c, 0x74, 0x69, 0x70, 0x20, 0x66, 0x6f, 
+  0x72, 0x20, 0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 
+  0x20, 0x72, 0x69, 0x67, 0x68, 0x74, 0x20, 0x28, 
+  0x63, 0x6c, 0x6f, 0x63, 0x6b, 0x77, 0x69, 0x73, 
+  0x65, 0x29, 0x20, 0x62, 0x75, 0x74, 0x74, 0x6f, 
+  0x6e, 0x22, 0x3e, 0x52, 0x6f, 0x74, 0x61, 0x74, 
+  0x65, 0x20, 0x74, 0x68, 0x65, 0x20, 0x70, 0x61, 
+  0x67, 0x65, 0x20, 0x74, 0x6f, 0x20, 0x74, 0x68, 
+  0x65, 0x20, 0x72, 0x69, 0x67, 0x68, 0x74, 0x20, 
+  0x28, 0x63, 0x6c, 0x6f, 0x63, 0x6b, 0x77, 0x69, 
+  0x73, 0x65, 0x29, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 
+  0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 
+  0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 
+  0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 
+  0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 
+  0x3d, 0x22, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x20, 
+  0x6f, 0x6e, 0x20, 0x72, 0x6f, 0x74, 0x61, 0x74, 
+  0x65, 0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 0x72, 
+  0x69, 0x67, 0x68, 0x74, 0x20, 0x28, 0x63, 0x6c, 
+  0x6f, 0x63, 0x6b, 0x77, 0x69, 0x73, 0x65, 0x29, 
+  0x20, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x52, 
+  0x6f, 0x74, 0x61, 0x74, 0x65, 0x20, 0x52, 0x69, 
+  0x67, 0x68, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 
+  0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 
+  0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 
+  0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x2d, 0x72, 0x6f, 
+  0x74, 0x61, 0x74, 0x65, 0x2d, 0x72, 0x69, 0x67, 
+  0x68, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 
+  0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x63, 0x6c, 0x69, 0x63, 0x6b, 
+  0x65, 0x64, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 
+  0x6c, 0x65, 0x72, 0x3d, 0x22, 0x72, 0x6f, 0x74, 
+  0x61, 0x74, 0x65, 0x5f, 0x72, 0x69, 0x67, 0x68, 
+  0x74, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
+  0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 
+  0x5f, 0x63, 0x62, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
+  0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 
+  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x68, 0x6f, 0x6d, 0x6f, 0x67, 0x65, 0x6e, 0x65, 
+  0x6f, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 
+  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
+  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, 
+  0x6f, 0x67, 0x67, 0x6c, 0x65, 0x54, 0x6f, 0x6f, 
+  0x6c, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 0x72, 0x6f, 
+  0x70, 0x5f, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x75, 
+  0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
+  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 
+  0x6f, 0x6c, 0x74, 0x69, 0x70, 0x5f, 0x74, 0x65, 
+  0x78, 0x74, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
+  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
+  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x43, 
+  0x72, 0x6f, 0x70, 0x20, 0x74, 0x68, 0x65, 0x20, 
+  0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x65, 0x64, 
+  0x20, 0x70, 0x61, 0x67, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x69, 0x73, 0x5f, 0x69, 0x6d, 0x70, 0x6f, 0x72, 
+  0x74, 0x61, 0x6e, 0x74, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
+  0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
+  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
+  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x43, 
+  0x72, 0x6f, 0x70, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 
+  0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 
+  0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 
+  0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x2d, 0x63, 0x72, 
+  0x6f, 0x70, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 
+  0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x74, 0x6f, 0x67, 0x67, 0x6c, 
+  0x65, 0x64, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 
+  0x6c, 0x65, 0x72, 0x3d, 0x22, 0x63, 0x72, 0x6f, 
+  0x70, 0x5f, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x75, 
+  0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x74, 0x6f, 0x67, 
+  0x67, 0x6c, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 
+  0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 
+  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 
+  0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x68, 0x6f, 0x6d, 0x6f, 
+  0x67, 0x65, 0x6e, 0x65, 0x6f, 0x75, 0x73, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
+  0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 
+  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 
+  0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 
+  0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 
+  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x70, 0x6c, 0x61, 0x63, 
+  0x65, 0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x2f, 
+  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
+  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, 
+  0x74, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x22, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x6d, 0x6f, 0x64, 0x65, 
+  0x5f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x22, 0x3e, 
+  0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 
+  0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x63, 0x6f, 
+  0x6c, 0x75, 0x6d, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 
+  0x65, 0x20, 0x6d, 0x6f, 0x64, 0x65, 0x20, 0x2d, 
+  0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 
+  0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 
+  0x67, 0x63, 0x68, 0x61, 0x72, 0x61, 0x72, 0x72, 
+  0x61, 0x79, 0x22, 0x2f, 0x3e, 0x3c, 0x21, 0x2d, 
+  0x2d, 0x20, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 
+  0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x6c, 0x61, 
+  0x62, 0x65, 0x6c, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 
+  0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x20, 0x74, 
+  0x79, 0x70, 0x65, 0x3d, 0x22, 0x67, 0x63, 0x68, 
+  0x61, 0x72, 0x61, 0x72, 0x72, 0x61, 0x79, 0x22, 
+  0x2f, 0x3e, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x75, 
+  0x6d, 0x6e, 0x73, 0x3e, 0x3c, 0x64, 0x61, 0x74, 
+  0x61, 0x3e, 0x3c, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 
+  0x63, 0x6f, 0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, 
+  0x30, 0x22, 0x3e, 0x74, 0x65, 0x78, 0x74, 0x3c, 
+  0x2f, 0x63, 0x6f, 0x6c, 0x3e, 0x3c, 0x63, 0x6f, 
+  0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x31, 0x22, 
+  0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 
+  0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 
+  0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 
+  0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x43, 0x6f, 
+  0x6d, 0x62, 0x6f, 0x20, 0x62, 0x6f, 0x78, 0x20, 
+  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x66, 0x6f, 
+  0x72, 0x20, 0x74, 0x65, 0x78, 0x74, 0x20, 0x73, 
+  0x63, 0x61, 0x6e, 0x20, 0x6d, 0x6f, 0x64, 0x65, 
+  0x22, 0x3e, 0x54, 0x65, 0x78, 0x74, 0x3c, 0x2f, 
+  0x63, 0x6f, 0x6c, 0x3e, 0x3c, 0x2f, 0x72, 0x6f, 
+  0x77, 0x3e, 0x3c, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 
+  0x63, 0x6f, 0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, 
+  0x30, 0x22, 0x3e, 0x70, 0x68, 0x6f, 0x74, 0x6f, 
+  0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x3e, 0x3c, 0x63, 
+  0x6f, 0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x31, 
+  0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 
+  0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 
+  0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 
+  0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x43, 
+  0x6f, 0x6d, 0x62, 0x6f, 0x20, 0x62, 0x6f, 0x78, 
+  0x20, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x66, 
+  0x6f, 0x72, 0x20, 0x70, 0x68, 0x6f, 0x74, 0x6f, 
+  0x20, 0x73, 0x63, 0x61, 0x6e, 0x20, 0x6d, 0x6f, 
+  0x64, 0x65, 0x22, 0x3e, 0x50, 0x68, 0x6f, 0x74, 
+  0x6f, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x3e, 0x3c, 
+  0x2f, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x2f, 0x64, 
+  0x61, 0x74, 0x61, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
+  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 
+  0x69, 0x73, 0x74, 0x53, 0x74, 0x6f, 0x72, 0x65, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x64, 0x65, 
+  0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x74, 0x6f, 
+  0x72, 0x65, 0x22, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 
+  0x75, 0x6d, 0x6e, 0x73, 0x3e, 0x3c, 0x21, 0x2d, 
+  0x2d, 0x20, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 
+  0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x64, 0x65, 
+  0x76, 0x69, 0x63, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 
+  0x65, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x63, 0x6f, 
+  0x6c, 0x75, 0x6d, 0x6e, 0x20, 0x74, 0x79, 0x70, 
+  0x65, 0x3d, 0x22, 0x67, 0x63, 0x68, 0x61, 0x72, 
+  0x61, 0x72, 0x72, 0x61, 0x79, 0x22, 0x2f, 0x3e, 
+  0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x63, 0x6f, 0x6c, 
+  0x75, 0x6d, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 0x65, 
+  0x20, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x2d, 
+  0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 
+  0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 
+  0x67, 0x63, 0x68, 0x61, 0x72, 0x61, 0x72, 0x72, 
+  0x61, 0x79, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x63, 
+  0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x3e, 0x3c, 
+  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
+  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
+  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
+  0x74, 0x6b, 0x44, 0x69, 0x61, 0x6c, 0x6f, 0x67, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x75, 
+  0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x65, 0x5f, 
+  0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x22, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, 
+  0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x32, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x72, 0x65, 0x73, 0x69, 0x7a, 
+  0x61, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x46, 0x61, 
+  0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6f, 
+  0x64, 0x61, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x74, 0x79, 0x70, 0x65, 
+  0x5f, 0x68, 0x69, 0x6e, 0x74, 0x22, 0x3e, 0x6e, 
+  0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x75, 0x72, 0x67, 0x65, 0x6e, 0x63, 0x79, 0x5f, 
+  0x68, 0x69, 0x6e, 0x74, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x72, 0x61, 
+  0x6e, 0x73, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x66, 
+  0x6f, 0x72, 0x22, 0x3e, 0x73, 0x69, 0x6d, 0x70, 
+  0x6c, 0x65, 0x5f, 0x73, 0x63, 0x61, 0x6e, 0x5f, 
+  0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 
+  0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 
+  0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, 0x22, 
+  0x76, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
+  0x56, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 
+  0x2d, 0x76, 0x62, 0x6f, 0x78, 0x31, 0x22, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 
+  0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
+  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x56, 
+  0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x76, 0x62, 0x6f, 0x78, 0x35, 0x22, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, 
+  0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x35, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 
+  0x67, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
+  0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x61, 0x75, 0x74, 0x68, 
+  0x6f, 0x72, 0x69, 0x7a, 0x65, 0x5f, 0x6c, 0x61, 
+  0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
+  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
+  0x65, 0x6c, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 
+  0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x54, 0x68, 
+  0x69, 0x73, 0x20, 0x6c, 0x61, 0x62, 0x65, 0x6c, 
+  0x20, 0x69, 0x73, 0x20, 0x73, 0x65, 0x74, 0x20, 
+  0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x61, 
+  0x6c, 0x6c, 0x79, 0x20, 0x61, 0x6e, 0x64, 0x20, 
+  0x69, 0x73, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x74, 
+  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 
+  0x64, 0x22, 0x3e, 0x54, 0x6f, 0x20, 0x63, 0x6f, 
+  0x6e, 0x6e, 0x65, 0x63, 0x74, 0x20, 0x74, 0x6f, 
+  0x20, 0x3f, 0x20, 0x79, 0x6f, 0x75, 0x20, 0x6e, 
+  0x65, 0x65, 0x64, 0x20, 0x74, 0x6f, 0x20, 0x61, 
+  0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 
+  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 
+  0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 
+  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
+  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, 0x61, 
+  0x62, 0x6c, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x32, 0x22, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x6e, 0x5f, 0x72, 0x6f, 0x77, 0x73, 0x22, 
+  0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6e, 0x5f, 0x63, 
+  0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x22, 0x3e, 
+  0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x75, 
+  0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 
+  0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x72, 0x6f, 0x77, 0x5f, 0x73, 0x70, 0x61, 0x63, 
+  0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
+  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
+  0x74, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x22, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x75, 0x73, 0x65, 
+  0x72, 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x65, 0x6e, 
+  0x74, 0x72, 0x79, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
+  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
+  0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 
+  0x6e, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x5f, 0x63, 0x68, 0x61, 0x72, 0x22, 0x3e, 0x26, 
+  0x23, 0x78, 0x32, 0x35, 0x43, 0x46, 0x3b, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 
+  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 
+  0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 
+  0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, 0x67, 
+  0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 
+  0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 
+  0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 
+  0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 
+  0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 
+  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
+  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
+  0x45, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x20, 0x69, 
+  0x64, 0x3d, 0x22, 0x70, 0x61, 0x73, 0x73, 0x77, 
+  0x6f, 0x72, 0x64, 0x5f, 0x65, 0x6e, 0x74, 0x72, 
+  0x79, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
+  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 
+  0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
+  0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x22, 
+  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x69, 0x6e, 0x76, 0x69, 0x73, 0x69, 0x62, 
+  0x6c, 0x65, 0x5f, 0x63, 0x68, 0x61, 0x72, 0x22, 
+  0x3e, 0x26, 0x23, 0x78, 0x32, 0x35, 0x43, 0x46, 
+  0x3b, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 
+  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 
+  0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 
+  0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 
+  0x69, 0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, 
+  0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 
+  0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 
+  0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 
+  0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 
+  0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 
+  0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 
+  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
+  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 
+  0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
+  0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 
+  0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 
+  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
+  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
+  0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 
+  0x74, 0x73, 0x3d, 0x22, 0x4c, 0x61, 0x62, 0x65, 
+  0x6c, 0x20, 0x62, 0x65, 0x73, 0x69, 0x64, 0x65, 
+  0x20, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 
+  0x65, 0x20, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x22, 
+  0x3e, 0x5f, 0x55, 0x73, 0x65, 0x72, 0x6e, 0x61, 
+  0x6d, 0x65, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x72, 
+  0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x3a, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 
+  0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 
+  0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 
+  0x22, 0x3e, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 
+  0x6d, 0x65, 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 
+  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, 
+  0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 
+  0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 
+  0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 
+  0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 
+  0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
+  0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 
+  0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 
+  0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x5f, 
+  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
+  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
+  0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 
+  0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 
+  0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 
+  0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 
+  0x73, 0x3d, 0x22, 0x4c, 0x61, 0x62, 0x65, 0x6c, 
+  0x20, 0x62, 0x65, 0x73, 0x69, 0x64, 0x65, 0x20, 
+  0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 
+  0x20, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x3e, 
+  0x5f, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 
+  0x64, 0x3a, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 
+  0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 
+  0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 
+  0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 
+  0x65, 0x74, 0x22, 0x3e, 0x70, 0x61, 0x73, 0x73, 
+  0x77, 0x6f, 0x72, 0x64, 0x5f, 0x65, 0x6e, 0x74, 
+  0x72, 0x79, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 
+  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 
+  0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 
+  0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 
+  0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, 
+  0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, 
+  0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 
+  0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 
+  0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 
+  0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 
+  0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
+  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
+  0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 
+  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 
+  0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
+  0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 
+  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 
+  0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 
+  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 
+  0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, 
+  0x6e, 0x5f, 0x61, 0x72, 0x65, 0x61, 0x22, 0x3e, 
+  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
+  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
+  0x74, 0x6b, 0x48, 0x42, 0x75, 0x74, 0x74, 0x6f, 
+  0x6e, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 
+  0x2d, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 
+  0x61, 0x72, 0x65, 0x61, 0x31, 0x22, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
+  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
+  0x61, 0x79, 0x6f, 0x75, 0x74, 0x5f, 0x73, 0x74, 
+  0x79, 0x6c, 0x65, 0x22, 0x3e, 0x65, 0x6e, 0x64, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
+  0x22, 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 
+  0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
+  0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 
+  0x65, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
+  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
+  0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 
+  0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 
+  0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 
+  0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x42, 0x75, 
+  0x74, 0x74, 0x6f, 0x6e, 0x20, 0x74, 0x6f, 0x20, 
+  0x73, 0x75, 0x62, 0x6d, 0x69, 0x74, 0x20, 0x61, 
+  0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x61, 
+  0x74, 0x69, 0x6f, 0x6e, 0x20, 0x64, 0x69, 0x61, 
+  0x6c, 0x6f, 0x67, 0x22, 0x3e, 0x5f, 0x41, 0x75, 
+  0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 
+  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 
+  0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 
+  0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 
+  0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 
+  0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 
+  0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 
+  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 
+  0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
+  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 
+  0x6c, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 
+  0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 
+  0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 
+  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 
+  0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
+  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x61, 0x63, 
+  0x6b, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, 
+  0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 
+  0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 
+  0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 
+  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
+  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x77, 
+  0x69, 0x64, 0x67, 0x65, 0x74, 0x73, 0x3e, 0x3c, 
+  0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x77, 
+  0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x72, 0x65, 
+  0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x3d, 0x22, 
+  0x30, 0x22, 0x3e, 0x61, 0x75, 0x74, 0x68, 0x6f, 
+  0x72, 0x69, 0x7a, 0x65, 0x5f, 0x62, 0x75, 0x74, 
+  0x74, 0x6f, 0x6e, 0x3c, 0x2f, 0x61, 0x63, 0x74, 
+  0x69, 0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x67, 
+  0x65, 0x74, 0x3e, 0x3c, 0x2f, 0x61, 0x63, 0x74, 
+  0x69, 0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x67, 
+  0x65, 0x74, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
+  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x44, 
+  0x69, 0x61, 0x6c, 0x6f, 0x67, 0x22, 0x20, 0x69, 
+  0x64, 0x3d, 0x22, 0x70, 0x72, 0x65, 0x66, 0x65, 
+  0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x5f, 0x64, 
+  0x69, 0x61, 0x6c, 0x6f, 0x67, 0x22, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 
+  0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, 0x69, 
+  0x64, 0x74, 0x68, 0x22, 0x3e, 0x37, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x22, 0x20, 
+  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
+  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
+  0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 
+  0x6e, 0x74, 0x73, 0x3d, 0x22, 0x54, 0x69, 0x74, 
+  0x6c, 0x65, 0x20, 0x6f, 0x66, 0x20, 0x70, 0x72, 
+  0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 
+  0x73, 0x20, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 
+  0x22, 0x3e, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 
+  0x65, 0x6e, 0x63, 0x65, 0x73, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x72, 0x65, 0x73, 0x69, 0x7a, 0x61, 0x62, 0x6c, 
+  0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 
+  0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x73, 0x63, 
+  0x61, 0x6e, 0x6e, 0x65, 0x72, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x74, 0x79, 0x70, 0x65, 0x5f, 0x68, 0x69, 0x6e, 
+  0x74, 0x22, 0x3e, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 
+  0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 
+  0x73, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x66, 0x6f, 
+  0x72, 0x22, 0x3e, 0x73, 0x69, 0x6d, 0x70, 0x6c, 
+  0x65, 0x5f, 0x73, 0x63, 0x61, 0x6e, 0x5f, 0x77, 
+  0x69, 0x6e, 0x64, 0x6f, 0x77, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 
+  0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x20, 
+  0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 
+  0x22, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 
+  0x6e, 0x63, 0x65, 0x73, 0x5f, 0x64, 0x69, 0x61, 
+  0x6c, 0x6f, 0x67, 0x5f, 0x72, 0x65, 0x73, 0x70, 
+  0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x63, 0x62, 0x22, 
+  0x2f, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 
+  0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x5f, 0x65, 
+  0x76, 0x65, 0x6e, 0x74, 0x22, 0x20, 0x68, 0x61, 
+  0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x70, 
+  0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 
+  0x65, 0x73, 0x5f, 0x64, 0x69, 0x61, 0x6c, 0x6f, 
+  0x67, 0x5f, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 
+  0x5f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x5f, 0x63, 
+  0x62, 0x22, 0x2f, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 
+  0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3d, 0x22, 0x76, 0x62, 0x6f, 0x78, 0x22, 
+  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
+  0x47, 0x74, 0x6b, 0x56, 0x42, 0x6f, 0x78, 0x22, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x64, 0x69, 0x61, 
+  0x6c, 0x6f, 0x67, 0x2d, 0x76, 0x62, 0x6f, 0x78, 
+  0x32, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
+  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, 
+  0x6e, 0x67, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
+  0x6b, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x22, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x74, 0x61, 0x62, 0x6c, 
+  0x65, 0x33, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
+  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x72, 0x64, 
+  0x65, 0x72, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, 
+  0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6e, 0x5f, 
+  0x72, 0x6f, 0x77, 0x73, 0x22, 0x3e, 0x37, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x6e, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 
+  0x6d, 0x6e, 0x73, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 
+  0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 
+  0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, 
+  0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 
+  0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
+  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 
+  0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 
+  0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 
+  0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 
+  0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 
+  0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 
+  0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 
+  0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 
+  0x4c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x62, 0x65, 
+  0x73, 0x69, 0x64, 0x65, 0x20, 0x73, 0x63, 0x61, 
+  0x6e, 0x20, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 
+  0x20, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x20, 0x62, 
+  0x6f, 0x78, 0x22, 0x3e, 0x53, 0x63, 0x61, 0x6e, 
+  0x20, 0x53, 0x5f, 0x6f, 0x75, 0x72, 0x63, 0x65, 
+  0x3a, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 
+  0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 
+  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 
+  0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 
+  0x74, 0x22, 0x3e, 0x64, 0x65, 0x76, 0x69, 0x63, 
+  0x65, 0x5f, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 
+  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, 
+  0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 
+  0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 
+  0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 
+  0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
+  0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
+  0x47, 0x74, 0x6b, 0x43, 0x6f, 0x6d, 0x62, 0x6f, 
+  0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 
+  0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x22, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
+  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 
+  0x6f, 0x64, 0x65, 0x6c, 0x22, 0x3e, 0x64, 0x65, 
+  0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 0x74, 0x6f, 
+  0x72, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x75, 0x74, 
+  0x74, 0x6f, 0x6e, 0x5f, 0x73, 0x65, 0x6e, 0x73, 
+  0x69, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x22, 
+  0x3e, 0x6f, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 
+  0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x68, 0x61, 0x6e, 
+  0x67, 0x65, 0x64, 0x22, 0x20, 0x68, 0x61, 0x6e, 
+  0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x64, 0x65, 
+  0x76, 0x69, 0x63, 0x65, 0x5f, 0x63, 0x6f, 0x6d, 
+  0x62, 0x6f, 0x5f, 0x63, 0x68, 0x61, 0x6e, 0x67, 
+  0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x2f, 0x3e, 
+  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
+  0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 
+  0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, 
+  0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 
+  0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 
+  0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 
+  0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 
+  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
+  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 
+  0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x64, 0x70, 
+  0x69, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 
+  0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
+  0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
+  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
+  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 
+  0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 
+  0x22, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x62, 
+  0x65, 0x73, 0x69, 0x64, 0x65, 0x20, 0x73, 0x63, 
+  0x61, 0x6e, 0x20, 0x73, 0x6f, 0x75, 0x72, 0x63, 
+  0x65, 0x20, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x20, 
+  0x62, 0x6f, 0x78, 0x22, 0x3e, 0x5f, 0x54, 0x65, 
+  0x78, 0x74, 0x20, 0x52, 0x65, 0x73, 0x6f, 0x6c, 
+  0x75, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 
+  0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 
+  0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 
+  0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 
+  0x74, 0x65, 0x78, 0x74, 0x5f, 0x64, 0x70, 0x69, 
+  0x5f, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 
+  0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 
+  0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 
+  0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 
+  0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, 
+  0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 
+  0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 
+  0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 
+  0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 
+  0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 
+  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
+  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 
+  0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
+  0x70, 0x68, 0x6f, 0x74, 0x6f, 0x5f, 0x64, 0x70, 
+  0x69, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 
+  0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
+  0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
+  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
+  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 
+  0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 
+  0x22, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x62, 
+  0x65, 0x73, 0x69, 0x64, 0x65, 0x20, 0x73, 0x63, 
+  0x61, 0x6e, 0x20, 0x73, 0x6f, 0x75, 0x72, 0x63, 
+  0x65, 0x20, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x20, 
+  0x62, 0x6f, 0x78, 0x22, 0x3e, 0x5f, 0x50, 0x68, 
+  0x6f, 0x74, 0x6f, 0x20, 0x52, 0x65, 0x73, 0x6f, 
+  0x6c, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 
+  0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 
+  0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 
+  0x3e, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x5f, 0x64, 
+  0x70, 0x69, 0x5f, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 
+  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 
+  0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 
+  0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 
+  0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 
+  0x63, 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 
+  0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 
+  0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 
+  0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 
+  0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 
+  0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 
+  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
+  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, 
+  0x6f, 0x6d, 0x62, 0x6f, 0x42, 0x6f, 0x78, 0x22, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x65, 0x78, 
+  0x74, 0x5f, 0x64, 0x70, 0x69, 0x5f, 0x63, 0x6f, 
+  0x6d, 0x62, 0x6f, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
+  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6f, 0x64, 
+  0x65, 0x6c, 0x22, 0x3e, 0x74, 0x65, 0x78, 0x74, 
+  0x5f, 0x64, 0x70, 0x69, 0x5f, 0x73, 0x74, 0x6f, 
+  0x72, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 
+  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
+  0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 
+  0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, 
+  0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 
+  0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 
+  0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 
+  0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 
+  0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 
+  0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 
+  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
+  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, 0x6f, 
+  0x6d, 0x62, 0x6f, 0x42, 0x6f, 0x78, 0x22, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x70, 0x68, 0x6f, 0x74, 
+  0x6f, 0x5f, 0x64, 0x70, 0x69, 0x5f, 0x63, 0x6f, 
+  0x6d, 0x62, 0x6f, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
+  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6f, 0x64, 
+  0x65, 0x6c, 0x22, 0x3e, 0x70, 0x68, 0x6f, 0x74, 
+  0x6f, 0x5f, 0x64, 0x70, 0x69, 0x5f, 0x73, 0x74, 
+  0x6f, 0x72, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
+  0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 
+  0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x61, 
+  0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 
+  0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 
+  0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 
+  0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 
+  0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 
+  0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 
+  0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 
+  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
+  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 
+  0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x73, 
+  0x69, 0x64, 0x65, 0x5f, 0x6c, 0x61, 0x62, 0x65, 
+  0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
+  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 
+  0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
+  0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 
+  0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 
+  0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 
+  0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 
+  0x73, 0x3d, 0x22, 0x4c, 0x61, 0x62, 0x65, 0x6c, 
+  0x20, 0x62, 0x65, 0x73, 0x69, 0x64, 0x65, 0x20, 
+  0x73, 0x63, 0x61, 0x6e, 0x20, 0x73, 0x69, 0x64, 
+  0x65, 0x20, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x20, 
+  0x62, 0x6f, 0x78, 0x22, 0x3e, 0x53, 0x63, 0x61, 
+  0x6e, 0x20, 0x53, 0x69, 0x64, 0x65, 0x3a, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 
+  0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 
+  0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 
+  0x3e, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x5f, 0x64, 
+  0x70, 0x69, 0x5f, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 
+  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 
+  0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 
+  0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 
+  0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 
+  0x63, 0x68, 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 
+  0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 
+  0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 
+  0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 
+  0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 
+  0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 
+  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
+  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, 
+  0x6f, 0x6d, 0x62, 0x6f, 0x42, 0x6f, 0x78, 0x22, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x61, 0x67, 
+  0x65, 0x5f, 0x73, 0x69, 0x64, 0x65, 0x5f, 0x63, 
+  0x6f, 0x6d, 0x62, 0x6f, 0x22, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
+  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6f, 
+  0x64, 0x65, 0x6c, 0x22, 0x3e, 0x70, 0x61, 0x67, 
+  0x65, 0x5f, 0x73, 0x69, 0x64, 0x65, 0x5f, 0x73, 
+  0x74, 0x6f, 0x72, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
+  0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 
+  0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 
+  0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 
+  0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 
+  0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 
+  0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 
+  0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 
+  0x68, 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 
+  0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 
+  0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 
+  0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 
+  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
+  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
+  0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 
+  0x64, 0x3d, 0x22, 0x70, 0x61, 0x70, 0x65, 0x72, 
+  0x5f, 0x73, 0x69, 0x7a, 0x65, 0x5f, 0x6c, 0x61, 
+  0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
+  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 
+  0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 
+  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
+  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
+  0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 
+  0x6e, 0x74, 0x73, 0x3d, 0x22, 0x4c, 0x61, 0x62, 
+  0x65, 0x6c, 0x20, 0x62, 0x65, 0x73, 0x69, 0x64, 
+  0x65, 0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 0x73, 
+  0x69, 0x7a, 0x65, 0x20, 0x63, 0x6f, 0x6d, 0x62, 
+  0x6f, 0x20, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x50, 
+  0x61, 0x67, 0x65, 0x20, 0x53, 0x69, 0x7a, 0x65, 
+  0x3a, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 
+  0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 
+  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 
+  0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 
+  0x74, 0x22, 0x3e, 0x70, 0x68, 0x6f, 0x74, 0x6f, 
+  0x5f, 0x64, 0x70, 0x69, 0x5f, 0x63, 0x6f, 0x6d, 
+  0x62, 0x6f, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 
+  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 
+  0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 
+  0x68, 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 
+  0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, 
+  0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x35, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, 
+  0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 
+  0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 
+  0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 
+  0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 
+  0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
+  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
+  0x6b, 0x43, 0x6f, 0x6d, 0x62, 0x6f, 0x42, 0x6f, 
+  0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 
+  0x61, 0x70, 0x65, 0x72, 0x5f, 0x73, 0x69, 0x7a, 
+  0x65, 0x5f, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x22, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x22, 0x3e, 
+  0x70, 0x61, 0x70, 0x65, 0x72, 0x5f, 0x73, 0x69, 
+  0x7a, 0x65, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 
+  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 
+  0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 
+  0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, 
+  0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 
+  0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 
+  0x63, 0x68, 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 
+  0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x35, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 
+  0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 
+  0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 
+  0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
+  0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 
+  0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, 
+  0x72, 0x69, 0x67, 0x68, 0x74, 0x6e, 0x65, 0x73, 
+  0x73, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
+  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 
+  0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 
+  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
+  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
+  0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 
+  0x74, 0x73, 0x3d, 0x22, 0x4c, 0x61, 0x62, 0x65, 
+  0x6c, 0x20, 0x62, 0x65, 0x73, 0x69, 0x64, 0x65, 
+  0x20, 0x62, 0x72, 0x69, 0x67, 0x68, 0x74, 0x6e, 
+  0x65, 0x73, 0x73, 0x20, 0x73, 0x63, 0x61, 0x6c, 
+  0x65, 0x22, 0x3e, 0x42, 0x72, 0x69, 0x67, 0x68, 
+  0x74, 0x6e, 0x65, 0x73, 0x73, 0x3a, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 
+  0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 
+  0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 
+  0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 
+  0x62, 0x72, 0x69, 0x67, 0x68, 0x74, 0x6e, 0x65, 
+  0x73, 0x73, 0x5f, 0x61, 0x64, 0x6a, 0x75, 0x73, 
+  0x74, 0x6d, 0x65, 0x6e, 0x74, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
+  0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 
+  0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x35, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 
+  0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 
+  0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, 
+  0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 
+  0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 
+  0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 
+  0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 
+  0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
+  0x22, 0x47, 0x74, 0x6b, 0x53, 0x63, 0x61, 0x6c, 
+  0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, 
+  0x72, 0x69, 0x67, 0x68, 0x74, 0x6e, 0x65, 0x73, 
+  0x73, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x22, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
+  0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x61, 0x64, 0x6a, 0x75, 0x73, 
+  0x74, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x62, 
+  0x72, 0x69, 0x67, 0x68, 0x74, 0x6e, 0x65, 0x73, 
+  0x73, 0x5f, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 
+  0x6d, 0x65, 0x6e, 0x74, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 
+  0x72, 0x61, 0x77, 0x5f, 0x76, 0x61, 0x6c, 0x75, 
+  0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 
+  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 
+  0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 
+  0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, 
+  0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 
+  0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 
+  0x63, 0x68, 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 
+  0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x36, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 
+  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
+  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 
+  0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x73, 
+  0x74, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
+  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 
+  0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 
+  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
+  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
+  0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 
+  0x74, 0x73, 0x3d, 0x22, 0x4c, 0x61, 0x62, 0x65, 
+  0x6c, 0x20, 0x62, 0x65, 0x73, 0x69, 0x64, 0x65, 
+  0x20, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x73, 
+  0x74, 0x20, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x22, 
+  0x3e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x73, 
+  0x74, 0x3a, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 
+  0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 
+  0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 
+  0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 
+  0x65, 0x74, 0x22, 0x3e, 0x63, 0x6f, 0x6e, 0x74, 
+  0x72, 0x61, 0x73, 0x74, 0x5f, 0x73, 0x63, 0x61, 
+  0x6c, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 
+  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 
+  0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 
+  0x68, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 
+  0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, 
+  0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x37, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, 
+  0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 
+  0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 
+  0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 
+  0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 
+  0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
+  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
+  0x6b, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x22, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x63, 0x6f, 0x6e, 0x74, 
+  0x72, 0x61, 0x73, 0x74, 0x5f, 0x73, 0x63, 0x61, 
+  0x6c, 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
+  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
+  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x64, 
+  0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, 
+  0x22, 0x3e, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 
+  0x73, 0x74, 0x5f, 0x61, 0x64, 0x6a, 0x75, 0x73, 
+  0x74, 0x6d, 0x65, 0x6e, 0x74, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x64, 0x72, 0x61, 0x77, 0x5f, 0x76, 0x61, 0x6c, 
+  0x75, 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 
+  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 
+  0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 
+  0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 
+  0x69, 0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, 
+  0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 
+  0x61, 0x63, 0x68, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 
+  0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 
+  0x37, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 
+  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
+  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 
+  0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 
+  0x79, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
+  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 
+  0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 
+  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
+  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
+  0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 
+  0x74, 0x73, 0x3d, 0x22, 0x4c, 0x61, 0x62, 0x65, 
+  0x6c, 0x20, 0x62, 0x65, 0x73, 0x69, 0x64, 0x65, 
+  0x20, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 
+  0x20, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x22, 0x3e, 
+  0x51, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x3a, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 
+  0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 
+  0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 
+  0x22, 0x3e, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 
+  0x79, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 
+  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 
+  0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 
+  0x37, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 
+  0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 
+  0x68, 0x22, 0x3e, 0x38, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 
+  0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 
+  0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 
+  0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 
+  0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 
+  0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 
+  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
+  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x63, 
+  0x61, 0x6c, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 
+  0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x22, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 
+  0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 
+  0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x71, 0x75, 
+  0x61, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x61, 0x64, 
+  0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, 
+  0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x3e, 0x46, 
+  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
+  0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 
+  0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 
+  0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 
+  0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 
+  0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 
+  0x37, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 
+  0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 
+  0x68, 0x22, 0x3e, 0x38, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
+  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 
+  0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 
+  0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 
+  0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 
+  0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 
+  0x5f, 0x61, 0x72, 0x65, 0x61, 0x22, 0x3e, 0x3c, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
+  0x6b, 0x48, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
+  0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2d, 
+  0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x61, 
+  0x72, 0x65, 0x61, 0x32, 0x22, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
+  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 
+  0x79, 0x6f, 0x75, 0x74, 0x5f, 0x73, 0x74, 0x79, 
+  0x6c, 0x65, 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
+  0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, 
+  0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 
+  0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 
+  0x65, 0x73, 0x5f, 0x63, 0x6c, 0x6f, 0x73, 0x65, 
+  0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 
+  0x67, 0x74, 0x6b, 0x2d, 0x63, 0x6c, 0x6f, 0x73, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
+  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
+  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 
+  0x63, 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 
+  0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 
+  0x73, 0x65, 0x5f, 0x73, 0x74, 0x6f, 0x63, 0x6b, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 
+  0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 
+  0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 
+  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 
+  0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
+  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 
+  0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 
+  0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x70, 0x61, 0x63, 0x6b, 0x5f, 
+  0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, 0x65, 0x6e, 
+  0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 
+  0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 
+  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x61, 0x63, 
+  0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, 
+  0x67, 0x65, 0x74, 0x73, 0x3e, 0x3c, 0x61, 0x63, 
+  0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, 
+  0x67, 0x65, 0x74, 0x20, 0x72, 0x65, 0x73, 0x70, 
+  0x6f, 0x6e, 0x73, 0x65, 0x3d, 0x22, 0x31, 0x22, 
+  0x3e, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 
+  0x6e, 0x63, 0x65, 0x73, 0x5f, 0x63, 0x6c, 0x6f, 
+  0x73, 0x65, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 
+  0x6e, 0x3c, 0x2f, 0x61, 0x63, 0x74, 0x69, 0x6f, 
+  0x6e, 0x2d, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 
+  0x3e, 0x3c, 0x2f, 0x61, 0x63, 0x74, 0x69, 0x6f, 
+  0x6e, 0x2d, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 
+  0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
+  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 
+  0x75, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 
+  0x63, 0x61, 0x6e, 0x5f, 0x74, 0x6f, 0x6f, 0x6c, 
+  0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x6d, 
+  0x65, 0x6e, 0x75, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
+  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
+  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4d, 0x65, 
+  0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x73, 0x63, 0x61, 0x6e, 
+  0x5f, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x5f, 
+  0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x75, 0x74, 0x74, 
+  0x6f, 0x6e, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
+  0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
+  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
+  0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
+  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
+  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 
+  0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 
+  0x22, 0x54, 0x6f, 0x6f, 0x6c, 0x62, 0x61, 0x72, 
+  0x20, 0x73, 0x63, 0x61, 0x6e, 0x20, 0x6d, 0x65, 
+  0x6e, 0x75, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x20, 
+  0x74, 0x6f, 0x20, 0x73, 0x63, 0x61, 0x6e, 0x20, 
+  0x61, 0x20, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 
+  0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 0x66, 0x72, 
+  0x6f, 0x6d, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 
+  0x63, 0x61, 0x6e, 0x6e, 0x65, 0x72, 0x22, 0x3e, 
+  0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x20, 0x5f, 
+  0x50, 0x61, 0x67, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 
+  0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 
+  0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 
+  0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 
+  0x61, 0x74, 0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 
+  0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x73, 0x63, 
+  0x61, 0x6e, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 
+  0x6e, 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 
+  0x64, 0x5f, 0x63, 0x62, 0x22, 0x2f, 0x3e, 0x3c, 
+  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
+  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
+  0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 
+  0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 
+  0x63, 0x61, 0x6e, 0x5f, 0x61, 0x6c, 0x6c, 0x5f, 
+  0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x75, 0x74, 0x74, 
+  0x6f, 0x6e, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
+  0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
+  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
+  0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
+  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
+  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 
+  0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 
+  0x22, 0x54, 0x6f, 0x6f, 0x6c, 0x62, 0x61, 0x72, 
+  0x20, 0x73, 0x63, 0x61, 0x6e, 0x20, 0x6d, 0x65, 
+  0x6e, 0x75, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x20, 
+  0x74, 0x6f, 0x20, 0x73, 0x63, 0x61, 0x6e, 0x20, 
+  0x61, 0x6c, 0x6c, 0x20, 0x70, 0x61, 0x67, 0x65, 
+  0x73, 0x20, 0x66, 0x72, 0x6f, 0x6d, 0x20, 0x61, 
+  0x20, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 
+  0x74, 0x20, 0x66, 0x65, 0x65, 0x64, 0x65, 0x72, 
+  0x22, 0x3e, 0x41, 0x6c, 0x6c, 0x20, 0x50, 0x61, 
+  0x67, 0x65, 0x73, 0x20, 0x46, 0x72, 0x6f, 0x6d, 
+  0x20, 0x5f, 0x46, 0x65, 0x65, 0x64, 0x65, 0x72, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 
+  0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 
+  0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 
+  0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 
+  0x3d, 0x22, 0x63, 0x6f, 0x6e, 0x74, 0x69, 0x6e, 
+  0x75, 0x6f, 0x75, 0x73, 0x5f, 0x73, 0x63, 0x61, 
+  0x6e, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
+  0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 
+  0x5f, 0x63, 0x62, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
+  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
+  0x53, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, 0x6f, 
+  0x72, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 
+  0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6d, 
+  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x31, 
+  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 
+  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
+  0x22, 0x47, 0x74, 0x6b, 0x52, 0x61, 0x64, 0x69, 
+  0x6f, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 
+  0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 
+  0x65, 0x78, 0x74, 0x5f, 0x74, 0x6f, 0x6f, 0x6c, 
+  0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x6d, 
+  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 
+  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
+  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
+  0x73, 0x22, 0x3e, 0x54, 0x65, 0x78, 0x74, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 
+  0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x64, 0x72, 0x61, 0x77, 0x5f, 0x61, 0x73, 0x5f, 
+  0x72, 0x61, 0x64, 0x69, 0x6f, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 
+  0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x67, 0x67, 
+  0x6c, 0x65, 0x64, 0x22, 0x20, 0x68, 0x61, 0x6e, 
+  0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x74, 0x65, 
+  0x78, 0x74, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
+  0x74, 0x65, 0x6d, 0x5f, 0x74, 0x6f, 0x67, 0x67, 
+  0x6c, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x2f, 
+  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
+  0x47, 0x74, 0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, 
+  0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x68, 
+  0x6f, 0x74, 0x6f, 0x5f, 0x74, 0x6f, 0x6f, 0x6c, 
+  0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x6d, 
+  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 
+  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
+  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
+  0x73, 0x22, 0x3e, 0x50, 0x68, 0x6f, 0x74, 0x6f, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 
+  0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x64, 0x72, 0x61, 0x77, 0x5f, 0x61, 0x73, 0x5f, 
+  0x72, 0x61, 0x64, 0x69, 0x6f, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x67, 0x72, 
+  0x6f, 0x75, 0x70, 0x22, 0x3e, 0x74, 0x65, 0x78, 
+  0x74, 0x5f, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x75, 
+  0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x6d, 0x65, 0x6e, 
+  0x75, 0x69, 0x74, 0x65, 0x6d, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 
+  0x67, 0x67, 0x6c, 0x65, 0x64, 0x22, 0x20, 0x68, 
+  0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 
+  0x70, 0x68, 0x6f, 0x74, 0x6f, 0x5f, 0x6d, 0x65, 
+  0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x5f, 0x74, 
+  0x6f, 0x67, 0x67, 0x6c, 0x65, 0x64, 0x5f, 0x63, 
+  0x62, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
+  0x4c, 0x69, 0x73, 0x74, 0x53, 0x74, 0x6f, 0x72, 
+  0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 
+  0x68, 0x6f, 0x74, 0x6f, 0x5f, 0x64, 0x70, 0x69, 
+  0x5f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x22, 0x3e, 
+  0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 
+  0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x63, 0x6f, 
+  0x6c, 0x75, 0x6d, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 
+  0x65, 0x20, 0x64, 0x70, 0x69, 0x20, 0x2d, 0x2d, 
+  0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 
+  0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x67, 
+  0x69, 0x6e, 0x74, 0x22, 0x2f, 0x3e, 0x3c, 0x21, 
+  0x2d, 0x2d, 0x20, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 
+  0x6e, 0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x6c, 
+  0x61, 0x62, 0x65, 0x6c, 0x20, 0x2d, 0x2d, 0x3e, 
+  0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x20, 
+  0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x67, 0x63, 
+  0x68, 0x61, 0x72, 0x61, 0x72, 0x72, 0x61, 0x79, 
+  0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 
+  0x75, 0x6d, 0x6e, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
+  0x4c, 0x69, 0x73, 0x74, 0x53, 0x74, 0x6f, 0x72, 
+  0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 
+  0x65, 0x78, 0x74, 0x5f, 0x64, 0x70, 0x69, 0x5f, 
+  0x73, 0x74, 0x6f, 0x72, 0x65, 0x22, 0x3e, 0x3c, 
+  0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x3e, 
+  0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x63, 0x6f, 0x6c, 
+  0x75, 0x6d, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 0x65, 
+  0x20, 0x64, 0x70, 0x69, 0x20, 0x2d, 0x2d, 0x3e, 
+  0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x20, 
+  0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x67, 0x69, 
+  0x6e, 0x74, 0x22, 0x2f, 0x3e, 0x3c, 0x21, 0x2d, 
+  0x2d, 0x20, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 
+  0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x6c, 0x61, 
+  0x62, 0x65, 0x6c, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 
+  0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x20, 0x74, 
+  0x79, 0x70, 0x65, 0x3d, 0x22, 0x67, 0x63, 0x68, 
+  0x61, 0x72, 0x61, 0x72, 0x72, 0x61, 0x79, 0x22, 
+  0x2f, 0x3e, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x75, 
+  0x6d, 0x6e, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
+  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 
+  0x6d, 0x61, 0x67, 0x65, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x68, 0x65, 0x6c, 0x70, 0x5f, 0x69, 
+  0x6d, 0x61, 0x67, 0x65, 0x22, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
+  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x74, 
+  0x6f, 0x63, 0x6b, 0x22, 0x3e, 0x67, 0x74, 0x6b, 
+  0x2d, 0x68, 0x65, 0x6c, 0x70, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
+  0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, 0x6d, 
+  0x61, 0x69, 0x6c, 0x5f, 0x69, 0x6d, 0x61, 0x67, 
+  0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
+  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 
+  0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x6d, 0x61, 
+  0x69, 0x6c, 0x2d, 0x73, 0x65, 0x6e, 0x64, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
+  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, 
+  0x74, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x22, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x70, 0x61, 0x67, 0x65, 
+  0x5f, 0x73, 0x69, 0x64, 0x65, 0x5f, 0x73, 0x74, 
+  0x6f, 0x72, 0x65, 0x22, 0x3e, 0x3c, 0x63, 0x6f, 
+  0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x3e, 0x3c, 0x21, 
+  0x2d, 0x2d, 0x20, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 
+  0x6e, 0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x73, 
+  0x69, 0x64, 0x65, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 
+  0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x20, 0x74, 
+  0x79, 0x70, 0x65, 0x3d, 0x22, 0x67, 0x69, 0x6e, 
+  0x74, 0x22, 0x2f, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 
+  0x20, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2d, 
+  0x6e, 0x61, 0x6d, 0x65, 0x20, 0x6c, 0x61, 0x62, 
+  0x65, 0x6c, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x63, 
+  0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x20, 0x74, 0x79, 
+  0x70, 0x65, 0x3d, 0x22, 0x67, 0x63, 0x68, 0x61, 
+  0x72, 0x61, 0x72, 0x72, 0x61, 0x79, 0x22, 0x2f, 
+  0x3e, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 
+  0x6e, 0x73, 0x3e, 0x3c, 0x64, 0x61, 0x74, 0x61, 
+  0x3e, 0x3c, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x63, 
+  0x6f, 0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x30, 
+  0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 
+  0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x31, 0x22, 0x20, 0x74, 0x72, 0x61, 
+  0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 
+  0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 
+  0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 
+  0x3d, 0x22, 0x43, 0x6f, 0x6d, 0x62, 0x6f, 0x20, 
+  0x62, 0x6f, 0x78, 0x20, 0x6c, 0x61, 0x62, 0x65, 
+  0x6c, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x73, 0x63, 
+  0x61, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x20, 0x62, 
+  0x6f, 0x74, 0x68, 0x20, 0x73, 0x69, 0x64, 0x65, 
+  0x73, 0x20, 0x6f, 0x66, 0x20, 0x61, 0x20, 0x70, 
+  0x61, 0x67, 0x65, 0x22, 0x3e, 0x46, 0x72, 0x6f, 
+  0x6e, 0x74, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x42, 
+  0x61, 0x63, 0x6b, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 
+  0x3e, 0x3c, 0x2f, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 
+  0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x30, 0x22, 0x3e, 
+  0x31, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x3e, 0x3c, 
+  0x63, 0x6f, 0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, 
+  0x31, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 
+  0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 
+  0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 
+  0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 
+  0x43, 0x6f, 0x6d, 0x62, 0x6f, 0x20, 0x62, 0x6f, 
+  0x78, 0x20, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x20, 
+  0x66, 0x6f, 0x72, 0x20, 0x73, 0x63, 0x61, 0x6e, 
+  0x6e, 0x69, 0x6e, 0x67, 0x20, 0x74, 0x68, 0x65, 
+  0x20, 0x66, 0x72, 0x6f, 0x6e, 0x74, 0x20, 0x73, 
+  0x69, 0x64, 0x65, 0x20, 0x6f, 0x66, 0x20, 0x61, 
+  0x20, 0x70, 0x61, 0x67, 0x65, 0x22, 0x3e, 0x46, 
+  0x72, 0x6f, 0x6e, 0x74, 0x3c, 0x2f, 0x63, 0x6f, 
+  0x6c, 0x3e, 0x3c, 0x2f, 0x72, 0x6f, 0x77, 0x3e, 
+  0x3c, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x63, 0x6f, 
+  0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x30, 0x22, 
+  0x3e, 0x32, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x3e, 
+  0x3c, 0x63, 0x6f, 0x6c, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x31, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
+  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
+  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 
+  0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 
+  0x22, 0x43, 0x6f, 0x6d, 0x62, 0x6f, 0x20, 0x62, 
+  0x6f, 0x78, 0x20, 0x6c, 0x61, 0x62, 0x65, 0x6c, 
+  0x20, 0x66, 0x6f, 0x72, 0x20, 0x73, 0x63, 0x61, 
+  0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x20, 0x74, 0x68, 
+  0x65, 0x20, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x73, 
+  0x69, 0x64, 0x65, 0x20, 0x6f, 0x66, 0x20, 0x61, 
+  0x20, 0x70, 0x61, 0x67, 0x65, 0x22, 0x3e, 0x42, 
+  0x61, 0x63, 0x6b, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 
+  0x3e, 0x3c, 0x2f, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 
+  0x2f, 0x64, 0x61, 0x74, 0x61, 0x3e, 0x3c, 0x2f, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
+  0x6b, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x74, 0x6f, 
+  0x72, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
+  0x70, 0x61, 0x70, 0x65, 0x72, 0x5f, 0x73, 0x69, 
+  0x7a, 0x65, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x65, 
+  0x22, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 
+  0x6e, 0x73, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 
+  0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2d, 0x6e, 
+  0x61, 0x6d, 0x65, 0x20, 0x77, 0x69, 0x64, 0x74, 
+  0x68, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x63, 0x6f, 
+  0x6c, 0x75, 0x6d, 0x6e, 0x20, 0x74, 0x79, 0x70, 
+  0x65, 0x3d, 0x22, 0x67, 0x69, 0x6e, 0x74, 0x22, 
+  0x2f, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x63, 
+  0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2d, 0x6e, 0x61, 
+  0x6d, 0x65, 0x20, 0x68, 0x65, 0x69, 0x67, 0x68, 
+  0x74, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x63, 0x6f, 
+  0x6c, 0x75, 0x6d, 0x6e, 0x20, 0x74, 0x79, 0x70, 
+  0x65, 0x3d, 0x22, 0x67, 0x69, 0x6e, 0x74, 0x22, 
+  0x2f, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x63, 
+  0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2d, 0x6e, 0x61, 
+  0x6d, 0x65, 0x20, 0x6c, 0x61, 0x62, 0x65, 0x6c, 
+  0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 
+  0x75, 0x6d, 0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 
+  0x3d, 0x22, 0x67, 0x63, 0x68, 0x61, 0x72, 0x61, 
+  0x72, 0x72, 0x61, 0x79, 0x22, 0x2f, 0x3e, 0x3c, 
+  0x2f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 
+  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
+  0x22, 0x47, 0x74, 0x6b, 0x41, 0x64, 0x6a, 0x75, 
+  0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x62, 0x72, 0x69, 0x67, 
+  0x68, 0x74, 0x6e, 0x65, 0x73, 0x73, 0x5f, 0x61, 
+  0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 
+  0x74, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x6c, 0x6f, 0x77, 0x65, 0x72, 
+  0x22, 0x3e, 0x2d, 0x31, 0x30, 0x30, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x75, 0x70, 0x70, 0x65, 0x72, 0x22, 0x3e, 
+  0x31, 0x30, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x74, 
+  0x65, 0x70, 0x5f, 0x69, 0x6e, 0x63, 0x72, 0x65, 
+  0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x31, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x69, 
+  0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 
+  0x22, 0x3e, 0x31, 0x30, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
+  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
+  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
+  0x74, 0x6b, 0x41, 0x64, 0x6a, 0x75, 0x73, 0x74, 
+  0x6d, 0x65, 0x6e, 0x74, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 
+  0x73, 0x74, 0x5f, 0x61, 0x64, 0x6a, 0x75, 0x73, 
+  0x74, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
+  0x6f, 0x77, 0x65, 0x72, 0x22, 0x3e, 0x2d, 0x31, 
+  0x30, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x70, 0x70, 
+  0x65, 0x72, 0x22, 0x3e, 0x31, 0x30, 0x30, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x73, 0x74, 0x65, 0x70, 0x5f, 0x69, 
+  0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 
+  0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x61, 
+  0x67, 0x65, 0x5f, 0x69, 0x6e, 0x63, 0x72, 0x65, 
+  0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x31, 0x30, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
+  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x41, 0x64, 
+  0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x71, 0x75, 
+  0x61, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x61, 0x64, 
+  0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, 
+  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x6c, 0x6f, 0x77, 0x65, 0x72, 0x22, 
+  0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x70, 0x70, 
+  0x65, 0x72, 0x22, 0x3e, 0x31, 0x30, 0x30, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x73, 0x74, 0x65, 0x70, 0x5f, 0x69, 
+  0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 
+  0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x61, 
+  0x67, 0x65, 0x5f, 0x69, 0x6e, 0x63, 0x72, 0x65, 
+  0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x31, 0x30, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x69, 0x6e, 
+  0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x3e, 
+  0x0a, 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 
+  0x29
+} };
+
+static GStaticResource static_resource = { simple_scan_resource_data.data, sizeof (simple_scan_resource_data.data), NULL, NULL, NULL };
+extern GResource *simple_scan_get_resource (void);
+GResource *simple_scan_get_resource (void)
+{
+  return g_static_resource_get_resource (&static_resource);
+}
+/*
+  If G_HAS_CONSTRUCTORS is true then the compiler support *both* constructors and
+  destructors, in a sane way, including e.g. on library unload. If not you're on
+  your own.
+
+  Some compilers need #pragma to handle this, which does not work with macros,
+  so the way you need to use this is (for constructors):
+
+  #ifdef G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA
+  #pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(my_constructor)
+  #endif
+  G_DEFINE_CONSTRUCTOR(my_constructor)
+  static void my_constructor(void) {
+   ...
+  }
+
+*/
+
+#if  __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
+
+#define G_HAS_CONSTRUCTORS 1
+
+#define G_DEFINE_CONSTRUCTOR(_func) static void __attribute__((constructor)) _func (void);
+#define G_DEFINE_DESTRUCTOR(_func) static void __attribute__((destructor)) _func (void);
+
+#elif defined (_MSC_VER) && (_MSC_VER >= 1500)
+/* Visual studio 2008 and later has _Pragma */
+
+#define G_HAS_CONSTRUCTORS 1
+
+#define G_DEFINE_CONSTRUCTOR(_func) \
+  static void _func(void); \
+  static int _func ## _wrapper(void) { _func(); return 0; } \
+  __pragma(section(".CRT$XCU",read)) \
+  __declspec(allocate(".CRT$XCU")) static int (* _array ## _func)(void) = _func ## _wrapper;
+
+#define G_DEFINE_DESTRUCTOR(_func) \
+  static void _func(void); \
+  static int _func ## _constructor(void) { atexit (_func); return 0; } \
+  __pragma(section(".CRT$XCU",read)) \
+  __declspec(allocate(".CRT$XCU")) static int (* _array ## _func)(void) = _func ## _constructor;
+
+#elif defined (_MSC_VER)
+
+#define G_HAS_CONSTRUCTORS 1
+
+/* Pre Visual studio 2008 must use #pragma section */
+#define G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA 1
+#define G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA 1
+
+#define G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(_func) \
+  section(".CRT$XCU",read)
+#define G_DEFINE_CONSTRUCTOR(_func) \
+  static void _func(void); \
+  static int _func ## _wrapper(void) { _func(); return 0; } \
+  __declspec(allocate(".CRT$XCU")) static int (*p)(void) = _func ## _wrapper;
+
+#define G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(_func) \
+  section(".CRT$XCU",read)
+#define G_DEFINE_DESTRUCTOR(_func) \
+  static void _func(void); \
+  static int _func ## _constructor(void) { atexit (_func); return 0; } \
+  __declspec(allocate(".CRT$XCU")) static int (* _array ## _func)(void) = _func ## _constructor;
+
+#elif defined(__SUNPRO_C)
+
+/* This is not tested, but i believe it should work, based on:
+ * http://opensource.apple.com/source/OpenSSL098/OpenSSL098-35/src/fips/fips_premain.c
+ */
+
+#define G_HAS_CONSTRUCTORS 1
+
+#define G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA 1
+#define G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA 1
+
+#define G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(_func) \
+  init(_func)
+#define G_DEFINE_CONSTRUCTOR(_func) \
+  static void _func(void);
+
+#define G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(_func) \
+  fini(_func)
+#define G_DEFINE_DESTRUCTOR(_func) \
+  static void _func(void);
+
+#else
+
+/* constructors not supported for this compiler */
+
+#endif
+
+
+#ifdef G_HAS_CONSTRUCTORS
+
+#ifdef G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA
+#pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(resource_constructor)
+#endif
+G_DEFINE_CONSTRUCTOR(resource_constructor)
+#ifdef G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA
+#pragma G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(resource_destructor)
+#endif
+G_DEFINE_DESTRUCTOR(resource_destructor)
+
+#else
+#warning "Constructor not supported on this compiler, linking in resources will not work"
+#endif
+
+static void resource_constructor (void)
+{
+  g_static_resource_init (&static_resource);
+}
+
+static void resource_destructor (void)
+{
+  g_static_resource_fini (&static_resource);
+}
diff --git a/src/scanner.c b/src/scanner.c
index d564732..b67db5e 100644
--- a/src/scanner.c
+++ b/src/scanner.c
@@ -1,4 +1,4 @@
-/* scanner.c generated by valac 0.18.1, the Vala compiler
+/* scanner.c generated by valac 0.20.1, the Vala compiler
  * generated from scanner.vala, do not modify */
 
 /*
@@ -285,6 +285,7 @@ typedef struct _NotifyGotLine NotifyGotLine;
 typedef struct _NotifyGotLineClass NotifyGotLineClass;
 typedef struct _NotifyGotLinePrivate NotifyGotLinePrivate;
 #define _scan_line_unref0(var) ((var == NULL) ? NULL : (var = (scan_line_unref (var), NULL)))
+#define _g_thread_unref0(var) ((var == NULL) ? NULL : (var = (g_thread_unref (var), NULL)))
 #define _g_async_queue_unref0(var) ((var == NULL) ? NULL : (var = (g_async_queue_unref (var), NULL)))
 #define __g_list_free__scan_job_unref0_0(var) ((var == NULL) ? NULL : (var = (_g_list_free__scan_job_unref0_ (var), NULL)))
 #define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL)))
@@ -382,6 +383,8 @@ struct _ScanOptions {
 	ScanType type;
 	gint paper_width;
 	gint paper_height;
+	gint brightness;
+	gint contrast;
 };
 
 struct _ScanOptionsClass {
@@ -405,6 +408,8 @@ struct _ScanJob {
 	ScanType type;
 	gint page_width;
 	gint page_height;
+	gint brightness;
+	gint contrast;
 };
 
 struct _ScanJobClass {
@@ -926,6 +931,7 @@ static gint scanner_get_device_weight (const gchar* device);
 static gint scanner_compare_devices (ScanDevice* device1, ScanDevice* device2);
 static void scanner_do_redetect (Scanner* self);
 static gint _scanner_compare_devices_gcompare_func (gconstpointer a, gconstpointer b);
+static gint scanner_scale_int (Scanner* self, gint source_min, gint source_max, SANE_Option_Descriptor* option, gint value);
 static gboolean scanner_set_default_option (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index);
 static void scanner_set_bool_option (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index, gboolean value, gboolean* _result_);
 static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index, gint value, gint* _result_);
@@ -968,142 +974,226 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify
 
 ScanDevice* scan_device_construct (GType object_type) {
 	ScanDevice* self = NULL;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (ScanDevice*) g_type_create_instance (object_type);
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
+#line 982 "scanner.c"
 }
 
 
 ScanDevice* scan_device_new (void) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scan_device_construct (TYPE_SCAN_DEVICE);
+#line 989 "scanner.c"
 }
 
 
 static void value_scan_device_init (GValue* value) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
+#line 996 "scanner.c"
 }
 
 
 static void value_scan_device_free_value (GValue* value) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (value->data[0].v_pointer) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_device_unref (value->data[0].v_pointer);
+#line 1005 "scanner.c"
 	}
 }
 
 
 static void value_scan_device_copy_value (const GValue* src_value, GValue* dest_value) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (src_value->data[0].v_pointer) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = scan_device_ref (src_value->data[0].v_pointer);
+#line 1015 "scanner.c"
 	} else {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
+#line 1019 "scanner.c"
 	}
 }
 
 
 static gpointer value_scan_device_peek_pointer (const GValue* value) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
+#line 1027 "scanner.c"
 }
 
 
 static gchar* value_scan_device_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
+#line 1034 "scanner.c"
 		ScanDevice* object;
 		object = collect_values[0].v_pointer;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+#line 1041 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+#line 1045 "scanner.c"
 		}
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scan_device_ref (object);
+#line 1049 "scanner.c"
 	} else {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
+#line 1053 "scanner.c"
 	}
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
+#line 1057 "scanner.c"
 }
 
 
 static gchar* value_scan_device_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	ScanDevice** object_p;
 	object_p = collect_values[0].v_pointer;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!object_p) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
+#line 1068 "scanner.c"
 	}
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
+#line 1074 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
+#line 1078 "scanner.c"
 	} else {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scan_device_ref (value->data[0].v_pointer);
+#line 1082 "scanner.c"
 	}
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
+#line 1086 "scanner.c"
 }
 
 
 GParamSpec* param_spec_scan_device (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecScanDevice* spec;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_SCAN_DEVICE), NULL);
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
+#line 1100 "scanner.c"
 }
 
 
 gpointer value_get_scan_device (const GValue* value) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_DEVICE), NULL);
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
+#line 1109 "scanner.c"
 }
 
 
 void value_set_scan_device (GValue* value, gpointer v_object) {
 	ScanDevice* old;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_DEVICE));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SCAN_DEVICE));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_device_ref (value->data[0].v_pointer);
+#line 1129 "scanner.c"
 	} else {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
+#line 1133 "scanner.c"
 	}
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_device_unref (old);
+#line 1139 "scanner.c"
 	}
 }
 
 
 void value_take_scan_device (GValue* value, gpointer v_object) {
 	ScanDevice* old;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_DEVICE));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SCAN_DEVICE));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
+#line 1158 "scanner.c"
 	} else {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
+#line 1162 "scanner.c"
 	}
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_device_unref (old);
+#line 1168 "scanner.c"
 	}
 }
 
 
 static void scan_device_class_init (ScanDeviceClass * klass) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scan_device_parent_class = g_type_class_peek_parent (klass);
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	SCAN_DEVICE_CLASS (klass)->finalize = scan_device_finalize;
+#line 1178 "scanner.c"
 }
 
 
 static void scan_device_instance_init (ScanDevice * self) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
+#line 1185 "scanner.c"
 }
 
 
 static void scan_device_finalize (ScanDevice* obj) {
 	ScanDevice * self;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SCAN_DEVICE, ScanDevice);
+#line 16 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->name);
+#line 17 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->label);
+#line 1197 "scanner.c"
 }
 
 
@@ -1124,158 +1214,248 @@ GType scan_device_get_type (void) {
 gpointer scan_device_ref (gpointer instance) {
 	ScanDevice* self;
 	self = instance;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_atomic_int_inc (&self->ref_count);
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
+#line 1222 "scanner.c"
 }
 
 
 void scan_device_unref (gpointer instance) {
 	ScanDevice* self;
 	self = instance;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		SCAN_DEVICE_GET_CLASS (self)->finalize (self);
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
+#line 1235 "scanner.c"
 	}
 }
 
 
 ScanPageInfo* scan_page_info_construct (GType object_type) {
 	ScanPageInfo* self = NULL;
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (ScanPageInfo*) g_type_create_instance (object_type);
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
+#line 1246 "scanner.c"
 }
 
 
 ScanPageInfo* scan_page_info_new (void) {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scan_page_info_construct (TYPE_SCAN_PAGE_INFO);
+#line 1253 "scanner.c"
 }
 
 
 static void value_scan_page_info_init (GValue* value) {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
+#line 1260 "scanner.c"
 }
 
 
 static void value_scan_page_info_free_value (GValue* value) {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (value->data[0].v_pointer) {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_page_info_unref (value->data[0].v_pointer);
+#line 1269 "scanner.c"
 	}
 }
 
 
 static void value_scan_page_info_copy_value (const GValue* src_value, GValue* dest_value) {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (src_value->data[0].v_pointer) {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = scan_page_info_ref (src_value->data[0].v_pointer);
+#line 1279 "scanner.c"
 	} else {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
+#line 1283 "scanner.c"
 	}
 }
 
 
 static gpointer value_scan_page_info_peek_pointer (const GValue* value) {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
+#line 1291 "scanner.c"
 }
 
 
 static gchar* value_scan_page_info_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
+#line 1298 "scanner.c"
 		ScanPageInfo* object;
 		object = collect_values[0].v_pointer;
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+#line 1305 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+#line 1309 "scanner.c"
 		}
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scan_page_info_ref (object);
+#line 1313 "scanner.c"
 	} else {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
+#line 1317 "scanner.c"
 	}
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
+#line 1321 "scanner.c"
 }
 
 
 static gchar* value_scan_page_info_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	ScanPageInfo** object_p;
 	object_p = collect_values[0].v_pointer;
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!object_p) {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
+#line 1332 "scanner.c"
 	}
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
+#line 1338 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
+#line 1342 "scanner.c"
 	} else {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scan_page_info_ref (value->data[0].v_pointer);
+#line 1346 "scanner.c"
 	}
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
+#line 1350 "scanner.c"
 }
 
 
 GParamSpec* param_spec_scan_page_info (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecScanPageInfo* spec;
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_SCAN_PAGE_INFO), NULL);
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
+#line 1364 "scanner.c"
 }
 
 
 gpointer value_get_scan_page_info (const GValue* value) {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_PAGE_INFO), NULL);
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
+#line 1373 "scanner.c"
 }
 
 
 void value_set_scan_page_info (GValue* value, gpointer v_object) {
 	ScanPageInfo* old;
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_PAGE_INFO));
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SCAN_PAGE_INFO));
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_page_info_ref (value->data[0].v_pointer);
+#line 1393 "scanner.c"
 	} else {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
+#line 1397 "scanner.c"
 	}
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_page_info_unref (old);
+#line 1403 "scanner.c"
 	}
 }
 
 
 void value_take_scan_page_info (GValue* value, gpointer v_object) {
 	ScanPageInfo* old;
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_PAGE_INFO));
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SCAN_PAGE_INFO));
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
+#line 1422 "scanner.c"
 	} else {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
+#line 1426 "scanner.c"
 	}
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_page_info_unref (old);
+#line 1432 "scanner.c"
 	}
 }
 
 
 static void scan_page_info_class_init (ScanPageInfoClass * klass) {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scan_page_info_parent_class = g_type_class_peek_parent (klass);
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	SCAN_PAGE_INFO_CLASS (klass)->finalize = scan_page_info_finalize;
+#line 1442 "scanner.c"
 }
 
 
 static void scan_page_info_instance_init (ScanPageInfo * self) {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
+#line 1449 "scanner.c"
 }
 
 
 static void scan_page_info_finalize (ScanPageInfo* obj) {
 	ScanPageInfo * self;
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SCAN_PAGE_INFO, ScanPageInfo);
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->device);
+#line 1459 "scanner.c"
 }
 
 
@@ -1296,158 +1476,248 @@ GType scan_page_info_get_type (void) {
 gpointer scan_page_info_ref (gpointer instance) {
 	ScanPageInfo* self;
 	self = instance;
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_atomic_int_inc (&self->ref_count);
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
+#line 1484 "scanner.c"
 }
 
 
 void scan_page_info_unref (gpointer instance) {
 	ScanPageInfo* self;
 	self = instance;
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		SCAN_PAGE_INFO_GET_CLASS (self)->finalize (self);
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
+#line 1497 "scanner.c"
 	}
 }
 
 
 ScanLine* scan_line_construct (GType object_type) {
 	ScanLine* self = NULL;
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (ScanLine*) g_type_create_instance (object_type);
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
+#line 1508 "scanner.c"
 }
 
 
 ScanLine* scan_line_new (void) {
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scan_line_construct (TYPE_SCAN_LINE);
+#line 1515 "scanner.c"
 }
 
 
 static void value_scan_line_init (GValue* value) {
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
+#line 1522 "scanner.c"
 }
 
 
 static void value_scan_line_free_value (GValue* value) {
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (value->data[0].v_pointer) {
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_line_unref (value->data[0].v_pointer);
+#line 1531 "scanner.c"
 	}
 }
 
 
 static void value_scan_line_copy_value (const GValue* src_value, GValue* dest_value) {
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (src_value->data[0].v_pointer) {
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = scan_line_ref (src_value->data[0].v_pointer);
+#line 1541 "scanner.c"
 	} else {
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
+#line 1545 "scanner.c"
 	}
 }
 
 
 static gpointer value_scan_line_peek_pointer (const GValue* value) {
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
+#line 1553 "scanner.c"
 }
 
 
 static gchar* value_scan_line_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
+#line 1560 "scanner.c"
 		ScanLine* object;
 		object = collect_values[0].v_pointer;
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+#line 1567 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+#line 1571 "scanner.c"
 		}
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scan_line_ref (object);
+#line 1575 "scanner.c"
 	} else {
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
+#line 1579 "scanner.c"
 	}
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
+#line 1583 "scanner.c"
 }
 
 
 static gchar* value_scan_line_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	ScanLine** object_p;
 	object_p = collect_values[0].v_pointer;
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!object_p) {
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
+#line 1594 "scanner.c"
 	}
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
+#line 1600 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
+#line 1604 "scanner.c"
 	} else {
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scan_line_ref (value->data[0].v_pointer);
+#line 1608 "scanner.c"
 	}
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
+#line 1612 "scanner.c"
 }
 
 
 GParamSpec* param_spec_scan_line (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecScanLine* spec;
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_SCAN_LINE), NULL);
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
+#line 1626 "scanner.c"
 }
 
 
 gpointer value_get_scan_line (const GValue* value) {
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_LINE), NULL);
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
+#line 1635 "scanner.c"
 }
 
 
 void value_set_scan_line (GValue* value, gpointer v_object) {
 	ScanLine* old;
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_LINE));
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SCAN_LINE));
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_line_ref (value->data[0].v_pointer);
+#line 1655 "scanner.c"
 	} else {
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
+#line 1659 "scanner.c"
 	}
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_line_unref (old);
+#line 1665 "scanner.c"
 	}
 }
 
 
 void value_take_scan_line (GValue* value, gpointer v_object) {
 	ScanLine* old;
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_LINE));
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SCAN_LINE));
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
+#line 1684 "scanner.c"
 	} else {
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
+#line 1688 "scanner.c"
 	}
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_line_unref (old);
+#line 1694 "scanner.c"
 	}
 }
 
 
 static void scan_line_class_init (ScanLineClass * klass) {
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scan_line_parent_class = g_type_class_peek_parent (klass);
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	SCAN_LINE_CLASS (klass)->finalize = scan_line_finalize;
+#line 1704 "scanner.c"
 }
 
 
 static void scan_line_instance_init (ScanLine * self) {
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
+#line 1711 "scanner.c"
 }
 
 
 static void scan_line_finalize (ScanLine* obj) {
 	ScanLine * self;
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SCAN_LINE, ScanLine);
+#line 55 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->data = (g_free (self->data), NULL);
+#line 1721 "scanner.c"
 }
 
 
@@ -1468,17 +1738,24 @@ GType scan_line_get_type (void) {
 gpointer scan_line_ref (gpointer instance) {
 	ScanLine* self;
 	self = instance;
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_atomic_int_inc (&self->ref_count);
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
+#line 1746 "scanner.c"
 }
 
 
 void scan_line_unref (gpointer instance) {
 	ScanLine* self;
 	self = instance;
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		SCAN_LINE_GET_CLASS (self)->finalize (self);
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
+#line 1759 "scanner.c"
 	}
 }
 
@@ -1509,140 +1786,222 @@ GType scan_type_get_type (void) {
 
 ScanOptions* scan_options_construct (GType object_type) {
 	ScanOptions* self = NULL;
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (ScanOptions*) g_type_create_instance (object_type);
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
+#line 1794 "scanner.c"
 }
 
 
 ScanOptions* scan_options_new (void) {
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scan_options_construct (TYPE_SCAN_OPTIONS);
+#line 1801 "scanner.c"
 }
 
 
 static void value_scan_options_init (GValue* value) {
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
+#line 1808 "scanner.c"
 }
 
 
 static void value_scan_options_free_value (GValue* value) {
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (value->data[0].v_pointer) {
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_options_unref (value->data[0].v_pointer);
+#line 1817 "scanner.c"
 	}
 }
 
 
 static void value_scan_options_copy_value (const GValue* src_value, GValue* dest_value) {
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (src_value->data[0].v_pointer) {
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = scan_options_ref (src_value->data[0].v_pointer);
+#line 1827 "scanner.c"
 	} else {
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
+#line 1831 "scanner.c"
 	}
 }
 
 
 static gpointer value_scan_options_peek_pointer (const GValue* value) {
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
+#line 1839 "scanner.c"
 }
 
 
 static gchar* value_scan_options_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
+#line 1846 "scanner.c"
 		ScanOptions* object;
 		object = collect_values[0].v_pointer;
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+#line 1853 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+#line 1857 "scanner.c"
 		}
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scan_options_ref (object);
+#line 1861 "scanner.c"
 	} else {
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
+#line 1865 "scanner.c"
 	}
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
+#line 1869 "scanner.c"
 }
 
 
 static gchar* value_scan_options_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	ScanOptions** object_p;
 	object_p = collect_values[0].v_pointer;
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!object_p) {
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
+#line 1880 "scanner.c"
 	}
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
+#line 1886 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
+#line 1890 "scanner.c"
 	} else {
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scan_options_ref (value->data[0].v_pointer);
+#line 1894 "scanner.c"
 	}
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
+#line 1898 "scanner.c"
 }
 
 
 GParamSpec* param_spec_scan_options (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecScanOptions* spec;
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_SCAN_OPTIONS), NULL);
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
+#line 1912 "scanner.c"
 }
 
 
 gpointer value_get_scan_options (const GValue* value) {
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_OPTIONS), NULL);
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
+#line 1921 "scanner.c"
 }
 
 
 void value_set_scan_options (GValue* value, gpointer v_object) {
 	ScanOptions* old;
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_OPTIONS));
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SCAN_OPTIONS));
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_options_ref (value->data[0].v_pointer);
+#line 1941 "scanner.c"
 	} else {
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
+#line 1945 "scanner.c"
 	}
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_options_unref (old);
+#line 1951 "scanner.c"
 	}
 }
 
 
 void value_take_scan_options (GValue* value, gpointer v_object) {
 	ScanOptions* old;
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_OPTIONS));
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SCAN_OPTIONS));
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
+#line 1970 "scanner.c"
 	} else {
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
+#line 1974 "scanner.c"
 	}
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_options_unref (old);
+#line 1980 "scanner.c"
 	}
 }
 
 
 static void scan_options_class_init (ScanOptionsClass * klass) {
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scan_options_parent_class = g_type_class_peek_parent (klass);
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	SCAN_OPTIONS_CLASS (klass)->finalize = scan_options_finalize;
+#line 1990 "scanner.c"
 }
 
 
 static void scan_options_instance_init (ScanOptions * self) {
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
+#line 1997 "scanner.c"
 }
 
 
 static void scan_options_finalize (ScanOptions* obj) {
 	ScanOptions * self;
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SCAN_OPTIONS, ScanOptions);
+#line 2005 "scanner.c"
 }
 
 
@@ -1663,158 +2022,248 @@ GType scan_options_get_type (void) {
 gpointer scan_options_ref (gpointer instance) {
 	ScanOptions* self;
 	self = instance;
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_atomic_int_inc (&self->ref_count);
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
+#line 2030 "scanner.c"
 }
 
 
 void scan_options_unref (gpointer instance) {
 	ScanOptions* self;
 	self = instance;
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		SCAN_OPTIONS_GET_CLASS (self)->finalize (self);
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
+#line 2043 "scanner.c"
 	}
 }
 
 
 ScanJob* scan_job_construct (GType object_type) {
 	ScanJob* self = NULL;
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (ScanJob*) g_type_create_instance (object_type);
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
+#line 2054 "scanner.c"
 }
 
 
 ScanJob* scan_job_new (void) {
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scan_job_construct (TYPE_SCAN_JOB);
+#line 2061 "scanner.c"
 }
 
 
 static void value_scan_job_init (GValue* value) {
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
+#line 2068 "scanner.c"
 }
 
 
 static void value_scan_job_free_value (GValue* value) {
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (value->data[0].v_pointer) {
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_job_unref (value->data[0].v_pointer);
+#line 2077 "scanner.c"
 	}
 }
 
 
 static void value_scan_job_copy_value (const GValue* src_value, GValue* dest_value) {
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (src_value->data[0].v_pointer) {
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = scan_job_ref (src_value->data[0].v_pointer);
+#line 2087 "scanner.c"
 	} else {
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
+#line 2091 "scanner.c"
 	}
 }
 
 
 static gpointer value_scan_job_peek_pointer (const GValue* value) {
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
+#line 2099 "scanner.c"
 }
 
 
 static gchar* value_scan_job_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
+#line 2106 "scanner.c"
 		ScanJob* object;
 		object = collect_values[0].v_pointer;
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+#line 2113 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+#line 2117 "scanner.c"
 		}
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scan_job_ref (object);
+#line 2121 "scanner.c"
 	} else {
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
+#line 2125 "scanner.c"
 	}
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
+#line 2129 "scanner.c"
 }
 
 
 static gchar* value_scan_job_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	ScanJob** object_p;
 	object_p = collect_values[0].v_pointer;
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!object_p) {
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
+#line 2140 "scanner.c"
 	}
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
+#line 2146 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
+#line 2150 "scanner.c"
 	} else {
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scan_job_ref (value->data[0].v_pointer);
+#line 2154 "scanner.c"
 	}
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
+#line 2158 "scanner.c"
 }
 
 
 GParamSpec* param_spec_scan_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecScanJob* spec;
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_SCAN_JOB), NULL);
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
+#line 2172 "scanner.c"
 }
 
 
 gpointer value_get_scan_job (const GValue* value) {
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_JOB), NULL);
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
+#line 2181 "scanner.c"
 }
 
 
 void value_set_scan_job (GValue* value, gpointer v_object) {
 	ScanJob* old;
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_JOB));
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SCAN_JOB));
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_job_ref (value->data[0].v_pointer);
+#line 2201 "scanner.c"
 	} else {
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
+#line 2205 "scanner.c"
 	}
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_job_unref (old);
+#line 2211 "scanner.c"
 	}
 }
 
 
 void value_take_scan_job (GValue* value, gpointer v_object) {
 	ScanJob* old;
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_JOB));
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SCAN_JOB));
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
+#line 2230 "scanner.c"
 	} else {
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
+#line 2234 "scanner.c"
 	}
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_job_unref (old);
+#line 2240 "scanner.c"
 	}
 }
 
 
 static void scan_job_class_init (ScanJobClass * klass) {
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scan_job_parent_class = g_type_class_peek_parent (klass);
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	SCAN_JOB_CLASS (klass)->finalize = scan_job_finalize;
+#line 2250 "scanner.c"
 }
 
 
 static void scan_job_instance_init (ScanJob * self) {
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
+#line 2257 "scanner.c"
 }
 
 
 static void scan_job_finalize (ScanJob* obj) {
 	ScanJob * self;
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SCAN_JOB, ScanJob);
+#line 90 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->device);
+#line 2267 "scanner.c"
 }
 
 
@@ -1835,157 +2284,246 @@ GType scan_job_get_type (void) {
 gpointer scan_job_ref (gpointer instance) {
 	ScanJob* self;
 	self = instance;
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_atomic_int_inc (&self->ref_count);
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
+#line 2292 "scanner.c"
 }
 
 
 void scan_job_unref (gpointer instance) {
 	ScanJob* self;
 	self = instance;
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		SCAN_JOB_GET_CLASS (self)->finalize (self);
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
+#line 2305 "scanner.c"
 	}
 }
 
 
 Request* request_construct (GType object_type) {
 	Request* self = NULL;
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (Request*) g_type_create_instance (object_type);
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
+#line 2316 "scanner.c"
 }
 
 
 Request* request_new (void) {
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return request_construct (TYPE_REQUEST);
+#line 2323 "scanner.c"
 }
 
 
 static void value_request_init (GValue* value) {
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
+#line 2330 "scanner.c"
 }
 
 
 static void value_request_free_value (GValue* value) {
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (value->data[0].v_pointer) {
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		request_unref (value->data[0].v_pointer);
+#line 2339 "scanner.c"
 	}
 }
 
 
 static void value_request_copy_value (const GValue* src_value, GValue* dest_value) {
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (src_value->data[0].v_pointer) {
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = request_ref (src_value->data[0].v_pointer);
+#line 2349 "scanner.c"
 	} else {
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
+#line 2353 "scanner.c"
 	}
 }
 
 
 static gpointer value_request_peek_pointer (const GValue* value) {
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
+#line 2361 "scanner.c"
 }
 
 
 static gchar* value_request_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
+#line 2368 "scanner.c"
 		Request* object;
 		object = collect_values[0].v_pointer;
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+#line 2375 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+#line 2379 "scanner.c"
 		}
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = request_ref (object);
+#line 2383 "scanner.c"
 	} else {
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
+#line 2387 "scanner.c"
 	}
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
+#line 2391 "scanner.c"
 }
 
 
 static gchar* value_request_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	Request** object_p;
 	object_p = collect_values[0].v_pointer;
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!object_p) {
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
+#line 2402 "scanner.c"
 	}
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
+#line 2408 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
+#line 2412 "scanner.c"
 	} else {
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = request_ref (value->data[0].v_pointer);
+#line 2416 "scanner.c"
 	}
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
+#line 2420 "scanner.c"
 }
 
 
 GParamSpec* param_spec_request (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecRequest* spec;
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_REQUEST), NULL);
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
+#line 2434 "scanner.c"
 }
 
 
 gpointer value_get_request (const GValue* value) {
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_REQUEST), NULL);
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
+#line 2443 "scanner.c"
 }
 
 
 void value_set_request (GValue* value, gpointer v_object) {
 	Request* old;
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_REQUEST));
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_REQUEST));
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		request_ref (value->data[0].v_pointer);
+#line 2463 "scanner.c"
 	} else {
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
+#line 2467 "scanner.c"
 	}
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		request_unref (old);
+#line 2473 "scanner.c"
 	}
 }
 
 
 void value_take_request (GValue* value, gpointer v_object) {
 	Request* old;
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_REQUEST));
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_REQUEST));
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
+#line 2492 "scanner.c"
 	} else {
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
+#line 2496 "scanner.c"
 	}
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		request_unref (old);
+#line 2502 "scanner.c"
 	}
 }
 
 
 static void request_class_init (RequestClass * klass) {
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request_parent_class = g_type_class_peek_parent (klass);
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	REQUEST_CLASS (klass)->finalize = request_finalize;
+#line 2512 "scanner.c"
 }
 
 
 static void request_instance_init (Request * self) {
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
+#line 2519 "scanner.c"
 }
 
 
 static void request_finalize (Request* obj) {
 	Request * self;
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_REQUEST, Request);
+#line 2527 "scanner.c"
 }
 
 
@@ -2006,35 +2544,49 @@ GType request_get_type (void) {
 gpointer request_ref (gpointer instance) {
 	Request* self;
 	self = instance;
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_atomic_int_inc (&self->ref_count);
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
+#line 2552 "scanner.c"
 }
 
 
 void request_unref (gpointer instance) {
 	Request* self;
 	self = instance;
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		REQUEST_GET_CLASS (self)->finalize (self);
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
+#line 2565 "scanner.c"
 	}
 }
 
 
 RequestRedetect* request_redetect_construct (GType object_type) {
 	RequestRedetect* self = NULL;
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (RequestRedetect*) request_construct (object_type);
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
+#line 2576 "scanner.c"
 }
 
 
 RequestRedetect* request_redetect_new (void) {
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return request_redetect_construct (TYPE_REQUEST_REDETECT);
+#line 2583 "scanner.c"
 }
 
 
 static void request_redetect_class_init (RequestRedetectClass * klass) {
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request_redetect_parent_class = g_type_class_peek_parent (klass);
+#line 2590 "scanner.c"
 }
 
 
@@ -2056,18 +2608,25 @@ GType request_redetect_get_type (void) {
 
 RequestCancel* request_cancel_construct (GType object_type) {
 	RequestCancel* self = NULL;
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (RequestCancel*) request_construct (object_type);
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
+#line 2616 "scanner.c"
 }
 
 
 RequestCancel* request_cancel_new (void) {
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return request_cancel_construct (TYPE_REQUEST_CANCEL);
+#line 2623 "scanner.c"
 }
 
 
 static void request_cancel_class_init (RequestCancelClass * klass) {
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request_cancel_parent_class = g_type_class_peek_parent (klass);
+#line 2630 "scanner.c"
 }
 
 
@@ -2089,19 +2648,27 @@ GType request_cancel_get_type (void) {
 
 RequestStartScan* request_start_scan_construct (GType object_type) {
 	RequestStartScan* self = NULL;
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (RequestStartScan*) request_construct (object_type);
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
+#line 2656 "scanner.c"
 }
 
 
 RequestStartScan* request_start_scan_new (void) {
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return request_start_scan_construct (TYPE_REQUEST_START_SCAN);
+#line 2663 "scanner.c"
 }
 
 
 static void request_start_scan_class_init (RequestStartScanClass * klass) {
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request_start_scan_parent_class = g_type_class_peek_parent (klass);
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	REQUEST_CLASS (klass)->finalize = request_start_scan_finalize;
+#line 2672 "scanner.c"
 }
 
 
@@ -2111,9 +2678,13 @@ static void request_start_scan_instance_init (RequestStartScan * self) {
 
 static void request_start_scan_finalize (Request* obj) {
 	RequestStartScan * self;
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_REQUEST_START_SCAN, RequestStartScan);
+#line 109 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (self->job);
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	REQUEST_CLASS (request_start_scan_parent_class)->finalize (obj);
+#line 2688 "scanner.c"
 }
 
 
@@ -2131,18 +2702,25 @@ GType request_start_scan_get_type (void) {
 
 RequestQuit* request_quit_construct (GType object_type) {
 	RequestQuit* self = NULL;
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (RequestQuit*) request_construct (object_type);
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
+#line 2710 "scanner.c"
 }
 
 
 RequestQuit* request_quit_new (void) {
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return request_quit_construct (TYPE_REQUEST_QUIT);
+#line 2717 "scanner.c"
 }
 
 
 static void request_quit_class_init (RequestQuitClass * klass) {
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request_quit_parent_class = g_type_class_peek_parent (klass);
+#line 2724 "scanner.c"
 }
 
 
@@ -2164,142 +2742,226 @@ GType request_quit_get_type (void) {
 
 Credentials* credentials_construct (GType object_type) {
 	Credentials* self = NULL;
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (Credentials*) g_type_create_instance (object_type);
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
+#line 2750 "scanner.c"
 }
 
 
 Credentials* credentials_new (void) {
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return credentials_construct (TYPE_CREDENTIALS);
+#line 2757 "scanner.c"
 }
 
 
 static void value_credentials_init (GValue* value) {
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
+#line 2764 "scanner.c"
 }
 
 
 static void value_credentials_free_value (GValue* value) {
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (value->data[0].v_pointer) {
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		credentials_unref (value->data[0].v_pointer);
+#line 2773 "scanner.c"
 	}
 }
 
 
 static void value_credentials_copy_value (const GValue* src_value, GValue* dest_value) {
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (src_value->data[0].v_pointer) {
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = credentials_ref (src_value->data[0].v_pointer);
+#line 2783 "scanner.c"
 	} else {
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
+#line 2787 "scanner.c"
 	}
 }
 
 
 static gpointer value_credentials_peek_pointer (const GValue* value) {
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
+#line 2795 "scanner.c"
 }
 
 
 static gchar* value_credentials_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
+#line 2802 "scanner.c"
 		Credentials* object;
 		object = collect_values[0].v_pointer;
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+#line 2809 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+#line 2813 "scanner.c"
 		}
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = credentials_ref (object);
+#line 2817 "scanner.c"
 	} else {
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
+#line 2821 "scanner.c"
 	}
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
+#line 2825 "scanner.c"
 }
 
 
 static gchar* value_credentials_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	Credentials** object_p;
 	object_p = collect_values[0].v_pointer;
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!object_p) {
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
+#line 2836 "scanner.c"
 	}
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
+#line 2842 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
+#line 2846 "scanner.c"
 	} else {
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = credentials_ref (value->data[0].v_pointer);
+#line 2850 "scanner.c"
 	}
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
+#line 2854 "scanner.c"
 }
 
 
 GParamSpec* param_spec_credentials (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecCredentials* spec;
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_CREDENTIALS), NULL);
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
+#line 2868 "scanner.c"
 }
 
 
 gpointer value_get_credentials (const GValue* value) {
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_CREDENTIALS), NULL);
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
+#line 2877 "scanner.c"
 }
 
 
 void value_set_credentials (GValue* value, gpointer v_object) {
 	Credentials* old;
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_CREDENTIALS));
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_CREDENTIALS));
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		credentials_ref (value->data[0].v_pointer);
+#line 2897 "scanner.c"
 	} else {
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
+#line 2901 "scanner.c"
 	}
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		credentials_unref (old);
+#line 2907 "scanner.c"
 	}
 }
 
 
 void value_take_credentials (GValue* value, gpointer v_object) {
 	Credentials* old;
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_CREDENTIALS));
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_CREDENTIALS));
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
+#line 2926 "scanner.c"
 	} else {
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
+#line 2930 "scanner.c"
 	}
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		credentials_unref (old);
+#line 2936 "scanner.c"
 	}
 }
 
 
 static void credentials_class_init (CredentialsClass * klass) {
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	credentials_parent_class = g_type_class_peek_parent (klass);
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	CREDENTIALS_CLASS (klass)->finalize = credentials_finalize;
+#line 2946 "scanner.c"
 }
 
 
 static void credentials_instance_init (Credentials * self) {
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
+#line 2953 "scanner.c"
 }
 
 
 static void credentials_finalize (Credentials* obj) {
 	Credentials * self;
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CREDENTIALS, Credentials);
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->username);
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->password);
+#line 2965 "scanner.c"
 }
 
 
@@ -2320,17 +2982,24 @@ GType credentials_get_type (void) {
 gpointer credentials_ref (gpointer instance) {
 	Credentials* self;
 	self = instance;
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_atomic_int_inc (&self->ref_count);
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
+#line 2990 "scanner.c"
 }
 
 
 void credentials_unref (gpointer instance) {
 	Credentials* self;
 	self = instance;
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		CREDENTIALS_GET_CLASS (self)->finalize (self);
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
+#line 3003 "scanner.c"
 	}
 }
 
@@ -2348,153 +3017,241 @@ GType scan_state_get_type (void) {
 
 
 static void notify_real_run (Notify* self, Scanner* scanner) {
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (scanner != NULL);
+#line 3023 "scanner.c"
 }
 
 
 void notify_run (Notify* self, Scanner* scanner) {
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_GET_CLASS (self)->run (self, scanner);
+#line 3032 "scanner.c"
 }
 
 
 Notify* notify_construct (GType object_type) {
 	Notify* self = NULL;
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (Notify*) g_type_create_instance (object_type);
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
+#line 3042 "scanner.c"
 }
 
 
 Notify* notify_new (void) {
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_construct (TYPE_NOTIFY);
+#line 3049 "scanner.c"
 }
 
 
 static void value_notify_init (GValue* value) {
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
+#line 3056 "scanner.c"
 }
 
 
 static void value_notify_free_value (GValue* value) {
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (value->data[0].v_pointer) {
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		notify_unref (value->data[0].v_pointer);
+#line 3065 "scanner.c"
 	}
 }
 
 
 static void value_notify_copy_value (const GValue* src_value, GValue* dest_value) {
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (src_value->data[0].v_pointer) {
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = notify_ref (src_value->data[0].v_pointer);
+#line 3075 "scanner.c"
 	} else {
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
+#line 3079 "scanner.c"
 	}
 }
 
 
 static gpointer value_notify_peek_pointer (const GValue* value) {
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
+#line 3087 "scanner.c"
 }
 
 
 static gchar* value_notify_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
+#line 3094 "scanner.c"
 		Notify* object;
 		object = collect_values[0].v_pointer;
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+#line 3101 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+#line 3105 "scanner.c"
 		}
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = notify_ref (object);
+#line 3109 "scanner.c"
 	} else {
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
+#line 3113 "scanner.c"
 	}
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
+#line 3117 "scanner.c"
 }
 
 
 static gchar* value_notify_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	Notify** object_p;
 	object_p = collect_values[0].v_pointer;
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!object_p) {
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
+#line 3128 "scanner.c"
 	}
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
+#line 3134 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
+#line 3138 "scanner.c"
 	} else {
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = notify_ref (value->data[0].v_pointer);
+#line 3142 "scanner.c"
 	}
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
+#line 3146 "scanner.c"
 }
 
 
 GParamSpec* param_spec_notify (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecNotify* spec;
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_NOTIFY), NULL);
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
+#line 3160 "scanner.c"
 }
 
 
 gpointer value_get_notify (const GValue* value) {
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_NOTIFY), NULL);
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
+#line 3169 "scanner.c"
 }
 
 
 void value_set_notify (GValue* value, gpointer v_object) {
 	Notify* old;
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_NOTIFY));
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_NOTIFY));
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		notify_ref (value->data[0].v_pointer);
+#line 3189 "scanner.c"
 	} else {
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
+#line 3193 "scanner.c"
 	}
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		notify_unref (old);
+#line 3199 "scanner.c"
 	}
 }
 
 
 void value_take_notify (GValue* value, gpointer v_object) {
 	Notify* old;
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_NOTIFY));
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_NOTIFY));
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
+#line 3218 "scanner.c"
 	} else {
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
+#line 3222 "scanner.c"
 	}
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		notify_unref (old);
+#line 3228 "scanner.c"
 	}
 }
 
 
 static void notify_class_init (NotifyClass * klass) {
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_parent_class = g_type_class_peek_parent (klass);
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (klass)->finalize = notify_finalize;
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (klass)->run = notify_real_run;
+#line 3240 "scanner.c"
 }
 
 
 static void notify_instance_init (Notify * self) {
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
+#line 3247 "scanner.c"
 }
 
 
 static void notify_finalize (Notify* obj) {
 	Notify * self;
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NOTIFY, Notify);
+#line 3255 "scanner.c"
 }
 
 
@@ -2515,17 +3272,24 @@ GType notify_get_type (void) {
 gpointer notify_ref (gpointer instance) {
 	Notify* self;
 	self = instance;
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_atomic_int_inc (&self->ref_count);
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
+#line 3280 "scanner.c"
 }
 
 
 void notify_unref (gpointer instance) {
 	Notify* self;
 	self = instance;
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		NOTIFY_GET_CLASS (self)->finalize (self);
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
+#line 3293 "scanner.c"
 	}
 }
 
@@ -2533,28 +3297,41 @@ void notify_unref (gpointer instance) {
 static void notify_scanning_changed_real_run (Notify* base, Scanner* scanner) {
 	NotifyScanningChanged * self;
 	Scanner* _tmp0_;
+#line 138 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyScanningChanged*) base;
+#line 138 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (scanner != NULL);
+#line 138 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = scanner;
+#line 138 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_emit_by_name (_tmp0_, "scanning-changed");
+#line 3309 "scanner.c"
 }
 
 
 NotifyScanningChanged* notify_scanning_changed_construct (GType object_type) {
 	NotifyScanningChanged* self = NULL;
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyScanningChanged*) notify_construct (object_type);
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
+#line 3319 "scanner.c"
 }
 
 
 NotifyScanningChanged* notify_scanning_changed_new (void) {
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_scanning_changed_construct (TYPE_NOTIFY_SCANNING_CHANGED);
+#line 3326 "scanner.c"
 }
 
 
 static void notify_scanning_changed_class_init (NotifyScanningChangedClass * klass) {
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_scanning_changed_parent_class = g_type_class_peek_parent (klass);
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (klass)->run = notify_scanning_changed_real_run;
+#line 3335 "scanner.c"
 }
 
 
@@ -2575,31 +3352,46 @@ GType notify_scanning_changed_get_type (void) {
 
 
 static void _scan_device_unref0_ (gpointer var) {
+#line 144 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	(var == NULL) ? NULL : (var = (scan_device_unref (var), NULL));
+#line 3358 "scanner.c"
 }
 
 
 static void _g_list_free__scan_device_unref0_ (GList* self) {
+#line 144 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_list_foreach (self, (GFunc) _scan_device_unref0_, NULL);
+#line 144 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_list_free (self);
+#line 3367 "scanner.c"
 }
 
 
 NotifyUpdateDevices* notify_update_devices_construct (GType object_type, GList* devices) {
 	NotifyUpdateDevices* self = NULL;
 	GList* _tmp0_;
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyUpdateDevices*) notify_construct (object_type);
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = devices;
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	devices = NULL;
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	__g_list_free__scan_device_unref0_0 (self->priv->devices);
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->devices = _tmp0_;
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	__g_list_free__scan_device_unref0_0 (devices);
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
+#line 3388 "scanner.c"
 }
 
 
 NotifyUpdateDevices* notify_update_devices_new (GList* devices) {
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_update_devices_construct (TYPE_NOTIFY_UPDATE_DEVICES, devices);
+#line 3395 "scanner.c"
 }
 
 
@@ -2607,32 +3399,49 @@ static void notify_update_devices_real_run (Notify* base, Scanner* scanner) {
 	NotifyUpdateDevices * self;
 	Scanner* _tmp0_;
 	GList* _tmp1_;
+#line 145 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyUpdateDevices*) base;
+#line 145 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (scanner != NULL);
+#line 145 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = scanner;
+#line 145 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = self->priv->devices;
+#line 145 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_emit_by_name (_tmp0_, "update-devices", _tmp1_);
+#line 3413 "scanner.c"
 }
 
 
 static void notify_update_devices_class_init (NotifyUpdateDevicesClass * klass) {
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_update_devices_parent_class = g_type_class_peek_parent (klass);
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (klass)->finalize = notify_update_devices_finalize;
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_type_class_add_private (klass, sizeof (NotifyUpdateDevicesPrivate));
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (klass)->run = notify_update_devices_real_run;
+#line 3426 "scanner.c"
 }
 
 
 static void notify_update_devices_instance_init (NotifyUpdateDevices * self) {
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv = NOTIFY_UPDATE_DEVICES_GET_PRIVATE (self);
+#line 3433 "scanner.c"
 }
 
 
 static void notify_update_devices_finalize (Notify* obj) {
 	NotifyUpdateDevices * self;
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NOTIFY_UPDATE_DEVICES, NotifyUpdateDevices);
+#line 144 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	__g_list_free__scan_device_unref0_0 (self->priv->devices);
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_update_devices_parent_class)->finalize (obj);
+#line 3445 "scanner.c"
 }
 
 
@@ -2652,18 +3461,28 @@ NotifyRequestAuthorization* notify_request_authorization_construct (GType object
 	NotifyRequestAuthorization* self = NULL;
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (resource != NULL, NULL);
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyRequestAuthorization*) notify_construct (object_type);
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = resource;
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = g_strdup (_tmp0_);
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->priv->resource);
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->resource = _tmp1_;
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
+#line 3479 "scanner.c"
 }
 
 
 NotifyRequestAuthorization* notify_request_authorization_new (const gchar* resource) {
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_request_authorization_construct (TYPE_NOTIFY_REQUEST_AUTHORIZATION, resource);
+#line 3486 "scanner.c"
 }
 
 
@@ -2671,32 +3490,49 @@ static void notify_request_authorization_real_run (Notify* base, Scanner* scanne
 	NotifyRequestAuthorization * self;
 	Scanner* _tmp0_;
 	const gchar* _tmp1_;
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyRequestAuthorization*) base;
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (scanner != NULL);
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = scanner;
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = self->priv->resource;
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_emit_by_name (_tmp0_, "request-authorization", _tmp1_);
+#line 3504 "scanner.c"
 }
 
 
 static void notify_request_authorization_class_init (NotifyRequestAuthorizationClass * klass) {
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_request_authorization_parent_class = g_type_class_peek_parent (klass);
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (klass)->finalize = notify_request_authorization_finalize;
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_type_class_add_private (klass, sizeof (NotifyRequestAuthorizationPrivate));
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (klass)->run = notify_request_authorization_real_run;
+#line 3517 "scanner.c"
 }
 
 
 static void notify_request_authorization_instance_init (NotifyRequestAuthorization * self) {
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv = NOTIFY_REQUEST_AUTHORIZATION_GET_PRIVATE (self);
+#line 3524 "scanner.c"
 }
 
 
 static void notify_request_authorization_finalize (Notify* obj) {
 	NotifyRequestAuthorization * self;
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NOTIFY_REQUEST_AUTHORIZATION, NotifyRequestAuthorization);
+#line 151 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->priv->resource);
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_request_authorization_parent_class)->finalize (obj);
+#line 3536 "scanner.c"
 }
 
 
@@ -2717,20 +3553,32 @@ NotifyScanFailed* notify_scan_failed_construct (GType object_type, gint error_co
 	gint _tmp0_;
 	const gchar* _tmp1_;
 	gchar* _tmp2_;
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (error_string != NULL, NULL);
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyScanFailed*) notify_construct (object_type);
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = error_code;
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->error_code = _tmp0_;
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = error_string;
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = g_strdup (_tmp1_);
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->priv->error_string);
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->error_string = _tmp2_;
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
+#line 3575 "scanner.c"
 }
 
 
 NotifyScanFailed* notify_scan_failed_new (gint error_code, const gchar* error_string) {
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_scan_failed_construct (TYPE_NOTIFY_SCAN_FAILED, error_code, error_string);
+#line 3582 "scanner.c"
 }
 
 
@@ -2739,33 +3587,51 @@ static void notify_scan_failed_real_run (Notify* base, Scanner* scanner) {
 	Scanner* _tmp0_;
 	gint _tmp1_;
 	const gchar* _tmp2_;
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyScanFailed*) base;
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (scanner != NULL);
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = scanner;
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = self->priv->error_code;
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = self->priv->error_string;
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_emit_by_name (_tmp0_, "scan-failed", _tmp1_, _tmp2_);
+#line 3603 "scanner.c"
 }
 
 
 static void notify_scan_failed_class_init (NotifyScanFailedClass * klass) {
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_scan_failed_parent_class = g_type_class_peek_parent (klass);
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (klass)->finalize = notify_scan_failed_finalize;
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_type_class_add_private (klass, sizeof (NotifyScanFailedPrivate));
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (klass)->run = notify_scan_failed_real_run;
+#line 3616 "scanner.c"
 }
 
 
 static void notify_scan_failed_instance_init (NotifyScanFailed * self) {
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv = NOTIFY_SCAN_FAILED_GET_PRIVATE (self);
+#line 3623 "scanner.c"
 }
 
 
 static void notify_scan_failed_finalize (Notify* obj) {
 	NotifyScanFailed * self;
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NOTIFY_SCAN_FAILED, NotifyScanFailed);
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->priv->error_string);
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_scan_failed_parent_class)->finalize (obj);
+#line 3635 "scanner.c"
 }
 
 
@@ -2784,28 +3650,41 @@ GType notify_scan_failed_get_type (void) {
 static void notify_document_done_real_run (Notify* base, Scanner* scanner) {
 	NotifyDocumentDone * self;
 	Scanner* _tmp0_;
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyDocumentDone*) base;
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (scanner != NULL);
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = scanner;
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_emit_by_name (_tmp0_, "document-done");
+#line 3662 "scanner.c"
 }
 
 
 NotifyDocumentDone* notify_document_done_construct (GType object_type) {
 	NotifyDocumentDone* self = NULL;
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyDocumentDone*) notify_construct (object_type);
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
+#line 3672 "scanner.c"
 }
 
 
 NotifyDocumentDone* notify_document_done_new (void) {
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_document_done_construct (TYPE_NOTIFY_DOCUMENT_DONE);
+#line 3679 "scanner.c"
 }
 
 
 static void notify_document_done_class_init (NotifyDocumentDoneClass * klass) {
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_document_done_parent_class = g_type_class_peek_parent (klass);
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (klass)->run = notify_document_done_real_run;
+#line 3688 "scanner.c"
 }
 
 
@@ -2828,28 +3707,41 @@ GType notify_document_done_get_type (void) {
 static void notify_expect_page_real_run (Notify* base, Scanner* scanner) {
 	NotifyExpectPage * self;
 	Scanner* _tmp0_;
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyExpectPage*) base;
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (scanner != NULL);
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = scanner;
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_emit_by_name (_tmp0_, "expect-page");
+#line 3719 "scanner.c"
 }
 
 
 NotifyExpectPage* notify_expect_page_construct (GType object_type) {
 	NotifyExpectPage* self = NULL;
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyExpectPage*) notify_construct (object_type);
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
+#line 3729 "scanner.c"
 }
 
 
 NotifyExpectPage* notify_expect_page_new (void) {
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_expect_page_construct (TYPE_NOTIFY_EXPECT_PAGE);
+#line 3736 "scanner.c"
 }
 
 
 static void notify_expect_page_class_init (NotifyExpectPageClass * klass) {
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_expect_page_parent_class = g_type_class_peek_parent (klass);
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (klass)->run = notify_expect_page_real_run;
+#line 3745 "scanner.c"
 }
 
 
@@ -2870,7 +3762,9 @@ GType notify_expect_page_get_type (void) {
 
 
 static gpointer _scan_page_info_ref0 (gpointer self) {
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? scan_page_info_ref (self) : NULL;
+#line 3768 "scanner.c"
 }
 
 
@@ -2879,20 +3773,32 @@ NotifyGotPageInfo* notify_got_page_info_construct (GType object_type, gint job_i
 	gint _tmp0_;
 	ScanPageInfo* _tmp1_;
 	ScanPageInfo* _tmp2_;
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (info != NULL, NULL);
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyGotPageInfo*) notify_construct (object_type);
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = job_id;
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->job_id = _tmp0_;
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = info;
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _scan_page_info_ref0 (_tmp1_);
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_page_info_unref0 (self->priv->info);
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->info = _tmp2_;
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
+#line 3795 "scanner.c"
 }
 
 
 NotifyGotPageInfo* notify_got_page_info_new (gint job_id, ScanPageInfo* info) {
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_got_page_info_construct (TYPE_NOTIFY_GOT_PAGE_INFO, job_id, info);
+#line 3802 "scanner.c"
 }
 
 
@@ -2903,51 +3809,83 @@ static void notify_got_page_info_real_run (Notify* base, Scanner* scanner) {
 	Scanner* _tmp2_;
 	gint _tmp3_;
 	gboolean _tmp7_;
+#line 178 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyGotPageInfo*) base;
+#line 178 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (scanner != NULL);
+#line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = self->priv->job_id;
+#line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = scanner;
+#line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _tmp2_->first_job_id;
+#line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ >= _tmp3_) {
+#line 3825 "scanner.c"
 		gint _tmp4_;
 		Scanner* _tmp5_;
 		gint _tmp6_;
+#line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = self->priv->job_id;
+#line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp5_ = scanner;
+#line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = _tmp5_->job_id;
+#line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp4_ < _tmp6_;
+#line 3837 "scanner.c"
 	} else {
+#line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = FALSE;
+#line 3841 "scanner.c"
 	}
+#line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = _tmp0_;
+#line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp7_) {
+#line 3847 "scanner.c"
 		Scanner* _tmp8_;
 		ScanPageInfo* _tmp9_;
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = scanner;
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = self->priv->info;
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_signal_emit_by_name (_tmp8_, "got-page-info", _tmp9_);
+#line 3856 "scanner.c"
 	}
 }
 
 
 static void notify_got_page_info_class_init (NotifyGotPageInfoClass * klass) {
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_got_page_info_parent_class = g_type_class_peek_parent (klass);
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (klass)->finalize = notify_got_page_info_finalize;
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_type_class_add_private (klass, sizeof (NotifyGotPageInfoPrivate));
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (klass)->run = notify_got_page_info_real_run;
+#line 3870 "scanner.c"
 }
 
 
 static void notify_got_page_info_instance_init (NotifyGotPageInfo * self) {
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv = NOTIFY_GOT_PAGE_INFO_GET_PRIVATE (self);
+#line 3877 "scanner.c"
 }
 
 
 static void notify_got_page_info_finalize (Notify* obj) {
 	NotifyGotPageInfo * self;
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NOTIFY_GOT_PAGE_INFO, NotifyGotPageInfo);
+#line 177 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_page_info_unref0 (self->priv->info);
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_got_page_info_parent_class)->finalize (obj);
+#line 3889 "scanner.c"
 }
 
 
@@ -2966,15 +3904,22 @@ GType notify_got_page_info_get_type (void) {
 NotifyPageDone* notify_page_done_construct (GType object_type, gint job_id) {
 	NotifyPageDone* self = NULL;
 	gint _tmp0_;
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyPageDone*) notify_construct (object_type);
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = job_id;
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->job_id = _tmp0_;
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
+#line 3916 "scanner.c"
 }
 
 
 NotifyPageDone* notify_page_done_new (gint job_id) {
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_page_done_construct (TYPE_NOTIFY_PAGE_DONE, job_id);
+#line 3923 "scanner.c"
 }
 
 
@@ -2985,48 +3930,78 @@ static void notify_page_done_real_run (Notify* base, Scanner* scanner) {
 	Scanner* _tmp2_;
 	gint _tmp3_;
 	gboolean _tmp7_;
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyPageDone*) base;
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (scanner != NULL);
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = self->priv->job_id;
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = scanner;
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _tmp2_->first_job_id;
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ >= _tmp3_) {
+#line 3946 "scanner.c"
 		gint _tmp4_;
 		Scanner* _tmp5_;
 		gint _tmp6_;
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = self->priv->job_id;
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp5_ = scanner;
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = _tmp5_->job_id;
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp4_ < _tmp6_;
+#line 3958 "scanner.c"
 	} else {
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = FALSE;
+#line 3962 "scanner.c"
 	}
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = _tmp0_;
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp7_) {
+#line 3968 "scanner.c"
 		Scanner* _tmp8_;
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = scanner;
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_signal_emit_by_name (_tmp8_, "page-done");
+#line 3974 "scanner.c"
 	}
 }
 
 
 static void notify_page_done_class_init (NotifyPageDoneClass * klass) {
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_page_done_parent_class = g_type_class_peek_parent (klass);
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (klass)->finalize = notify_page_done_finalize;
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_type_class_add_private (klass, sizeof (NotifyPageDonePrivate));
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (klass)->run = notify_page_done_real_run;
+#line 3988 "scanner.c"
 }
 
 
 static void notify_page_done_instance_init (NotifyPageDone * self) {
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv = NOTIFY_PAGE_DONE_GET_PRIVATE (self);
+#line 3995 "scanner.c"
 }
 
 
 static void notify_page_done_finalize (Notify* obj) {
 	NotifyPageDone * self;
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NOTIFY_PAGE_DONE, NotifyPageDone);
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_page_done_parent_class)->finalize (obj);
+#line 4005 "scanner.c"
 }
 
 
@@ -3043,7 +4018,9 @@ GType notify_page_done_get_type (void) {
 
 
 static gpointer _scan_line_ref0 (gpointer self) {
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? scan_line_ref (self) : NULL;
+#line 4024 "scanner.c"
 }
 
 
@@ -3052,20 +4029,32 @@ NotifyGotLine* notify_got_line_construct (GType object_type, gint job_id, ScanLi
 	gint _tmp0_;
 	ScanLine* _tmp1_;
 	ScanLine* _tmp2_;
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (line != NULL, NULL);
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyGotLine*) notify_construct (object_type);
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = job_id;
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->job_id = _tmp0_;
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = line;
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _scan_line_ref0 (_tmp1_);
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_line_unref0 (self->priv->line);
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->line = _tmp2_;
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
+#line 4051 "scanner.c"
 }
 
 
 NotifyGotLine* notify_got_line_new (gint job_id, ScanLine* line) {
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_got_line_construct (TYPE_NOTIFY_GOT_LINE, job_id, line);
+#line 4058 "scanner.c"
 }
 
 
@@ -3076,51 +4065,83 @@ static void notify_got_line_real_run (Notify* base, Scanner* scanner) {
 	Scanner* _tmp2_;
 	gint _tmp3_;
 	gboolean _tmp7_;
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyGotLine*) base;
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (scanner != NULL);
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = self->priv->job_id;
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = scanner;
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _tmp2_->first_job_id;
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ >= _tmp3_) {
+#line 4081 "scanner.c"
 		gint _tmp4_;
 		Scanner* _tmp5_;
 		gint _tmp6_;
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = self->priv->job_id;
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp5_ = scanner;
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = _tmp5_->job_id;
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp4_ < _tmp6_;
+#line 4093 "scanner.c"
 	} else {
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = FALSE;
+#line 4097 "scanner.c"
 	}
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = _tmp0_;
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp7_) {
+#line 4103 "scanner.c"
 		Scanner* _tmp8_;
 		ScanLine* _tmp9_;
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = scanner;
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = self->priv->line;
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_signal_emit_by_name (_tmp8_, "got-line", _tmp9_);
+#line 4112 "scanner.c"
 	}
 }
 
 
 static void notify_got_line_class_init (NotifyGotLineClass * klass) {
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_got_line_parent_class = g_type_class_peek_parent (klass);
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (klass)->finalize = notify_got_line_finalize;
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_type_class_add_private (klass, sizeof (NotifyGotLinePrivate));
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (klass)->run = notify_got_line_real_run;
+#line 4126 "scanner.c"
 }
 
 
 static void notify_got_line_instance_init (NotifyGotLine * self) {
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv = NOTIFY_GOT_LINE_GET_PRIVATE (self);
+#line 4133 "scanner.c"
 }
 
 
 static void notify_got_line_finalize (Notify* obj) {
 	NotifyGotLine * self;
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NOTIFY_GOT_LINE, NotifyGotLine);
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_line_unref0 (self->priv->line);
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_got_line_parent_class)->finalize (obj);
+#line 4145 "scanner.c"
 }
 
 
@@ -3137,28 +4158,39 @@ GType notify_got_line_get_type (void) {
 
 
 static void _scan_job_unref0_ (gpointer var) {
+#line 234 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	(var == NULL) ? NULL : (var = (scan_job_unref (var), NULL));
+#line 4164 "scanner.c"
 }
 
 
 static void _g_list_free__scan_job_unref0_ (GList* self) {
+#line 234 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_list_foreach (self, (GFunc) _scan_job_unref0_, NULL);
+#line 234 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_list_free (self);
+#line 4173 "scanner.c"
 }
 
 
 static void _request_unref0_ (gpointer var) {
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	(var == NULL) ? NULL : (var = (request_unref (var), NULL));
+#line 4180 "scanner.c"
 }
 
 
 static void _notify_unref0_ (gpointer var) {
+#line 274 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	(var == NULL) ? NULL : (var = (notify_unref (var), NULL));
+#line 4187 "scanner.c"
 }
 
 
 static void _credentials_unref0_ (gpointer var) {
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	(var == NULL) ? NULL : (var = (credentials_unref (var), NULL));
+#line 4194 "scanner.c"
 }
 
 
@@ -3167,27 +4199,43 @@ static Scanner* scanner_construct (GType object_type) {
 	GAsyncQueue* _tmp0_;
 	GAsyncQueue* _tmp1_;
 	GAsyncQueue* _tmp2_;
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (Scanner*) g_type_create_instance (object_type);
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = g_async_queue_new_full (_request_unref0_);
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_async_queue_unref0 (self->priv->request_queue);
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->request_queue = _tmp0_;
+#line 274 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = g_async_queue_new_full (_notify_unref0_);
+#line 274 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_async_queue_unref0 (self->priv->notify_queue);
+#line 274 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->notify_queue = _tmp1_;
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = g_async_queue_new_full (_credentials_unref0_);
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_async_queue_unref0 (self->priv->authorize_queue);
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->authorize_queue = _tmp2_;
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
+#line 4225 "scanner.c"
 }
 
 
 static Scanner* scanner_new (void) {
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scanner_construct (TYPE_SCANNER);
+#line 4232 "scanner.c"
 }
 
 
 static gpointer _scanner_ref0 (gpointer self) {
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? scanner_ref (self) : NULL;
+#line 4239 "scanner.c"
 }
 
 
@@ -3196,17 +4244,29 @@ Scanner* scanner_get_instance (void) {
 	Scanner* _tmp0_;
 	Scanner* _tmp2_;
 	Scanner* _tmp3_;
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = scanner_scanner_object;
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_ == NULL) {
+#line 4252 "scanner.c"
 		Scanner* _tmp1_;
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp1_ = scanner_new ();
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scanner_unref0 (scanner_scanner_object);
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_scanner_object = _tmp1_;
+#line 4260 "scanner.c"
 	}
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = scanner_scanner_object;
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _scanner_ref0 (_tmp2_);
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = _tmp3_;
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
+#line 4270 "scanner.c"
 }
 
 
@@ -3215,26 +4275,39 @@ static gboolean scanner_notify_idle_cb (Scanner* self) {
 	GAsyncQueue* _tmp0_;
 	gpointer _tmp1_ = NULL;
 	Notify* notification;
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->notify_queue;
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = g_async_queue_pop (_tmp0_);
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notification = (Notify*) _tmp1_;
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_run (notification, self);
+#line 289 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = FALSE;
+#line 289 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_notify_unref0 (notification);
+#line 289 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
+#line 4295 "scanner.c"
 }
 
 
 static gpointer _notify_ref0 (gpointer self) {
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? notify_ref (self) : NULL;
+#line 4302 "scanner.c"
 }
 
 
 static gboolean _scanner_notify_idle_cb_gsource_func (gpointer self) {
 	gboolean result;
 	result = scanner_notify_idle_cb (self);
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
+#line 4311 "scanner.c"
 }
 
 
@@ -3242,13 +4315,21 @@ static void scanner_notify (Scanner* self, Notify* notification) {
 	GAsyncQueue* _tmp0_;
 	Notify* _tmp1_;
 	Notify* _tmp2_;
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (notification != NULL);
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->notify_queue;
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = notification;
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _notify_ref0 (_tmp1_);
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_async_queue_push (_tmp0_, _tmp2_);
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _scanner_notify_idle_cb_gsource_func, scanner_ref (self), scanner_unref);
+#line 4333 "scanner.c"
 }
 
 
@@ -3258,44 +4339,78 @@ static void scanner_set_scanning (Scanner* self, gboolean is_scanning) {
 	gboolean _tmp2_;
 	gboolean _tmp4_;
 	gboolean _tmp9_;
+#line 298 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = self->priv->scanning;
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp2_) {
+#line 4349 "scanner.c"
 		gboolean _tmp3_;
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = is_scanning;
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp1_ = !_tmp3_;
+#line 4355 "scanner.c"
 	} else {
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp1_ = FALSE;
+#line 4359 "scanner.c"
 	}
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = _tmp1_;
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp4_) {
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = TRUE;
+#line 4367 "scanner.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
 		gboolean _tmp6_;
 		gboolean _tmp8_;
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = self->priv->scanning;
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (!_tmp6_) {
+#line 4376 "scanner.c"
 			gboolean _tmp7_;
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp7_ = is_scanning;
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp5_ = _tmp7_;
+#line 4382 "scanner.c"
 		} else {
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp5_ = FALSE;
+#line 4386 "scanner.c"
 		}
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = _tmp5_;
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp8_;
+#line 4392 "scanner.c"
 	}
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp9_ = _tmp0_;
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp9_) {
+#line 4398 "scanner.c"
 		gboolean _tmp10_;
 		NotifyScanningChanged* _tmp11_;
 		NotifyScanningChanged* _tmp12_;
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp10_ = is_scanning;
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->scanning = _tmp10_;
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp11_ = notify_scanning_changed_new ();
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp12_ = _tmp11_;
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_notify (self, (Notify*) _tmp12_);
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_notify_unref0 (_tmp12_);
+#line 4414 "scanner.c"
 	}
 }
 
@@ -3304,12 +4419,19 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_;
 	gchar* _tmp1_ = NULL;
+#line 1238 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
+#line 1238 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
+#line 1239 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
+#line 1239 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
+#line 1239 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
+#line 1239 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	return result;
+#line 4435 "scanner.c"
 }
 
 
@@ -3319,21 +4441,37 @@ static gint scanner_get_device_weight (const gchar* device) {
 	gboolean _tmp1_ = FALSE;
 	const gchar* _tmp2_;
 	gboolean _tmp3_ = FALSE;
+#line 307 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (device != NULL, 0);
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = device;
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = g_str_has_prefix (_tmp0_, "vfl:");
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_) {
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		result = 2;
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
+#line 4457 "scanner.c"
 	}
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = device;
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = string_contains (_tmp2_, "usb");
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp3_) {
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		result = 0;
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
+#line 4469 "scanner.c"
 	}
+#line 319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = 1;
+#line 319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
+#line 4475 "scanner.c"
 }
 
 
@@ -3355,134 +4493,241 @@ static gint scanner_compare_devices (ScanDevice* device1, ScanDevice* device2) {
 	ScanDevice* _tmp13_;
 	const gchar* _tmp14_;
 	gint _tmp15_ = 0;
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (device1 != NULL, 0);
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (device2 != NULL, 0);
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = device1;
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->name;
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = scanner_get_device_weight (_tmp1_);
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	weight1 = _tmp2_;
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = device2;
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = _tmp3_->name;
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = scanner_get_device_weight (_tmp4_);
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	weight2 = _tmp5_;
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = weight1;
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = weight2;
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp6_ != _tmp7_) {
+#line 4523 "scanner.c"
 		gint _tmp8_;
 		gint _tmp9_;
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = weight1;
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = weight2;
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		result = _tmp8_ - _tmp9_;
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
+#line 4534 "scanner.c"
 	}
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = g_strcmp0;
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = device1;
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp12_ = _tmp11_->label;
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp13_ = device2;
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp14_ = _tmp13_->label;
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp15_ = _tmp10_ (_tmp12_, _tmp14_);
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = _tmp15_;
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
+#line 4552 "scanner.c"
 }
 
 
 static gchar* sane_status_to_string (SANE_Status status) {
 	gchar* result = NULL;
 	SANE_Status _tmp0_;
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 	_tmp0_ = status;
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 	switch (_tmp0_) {
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_GOOD:
+#line 4565 "scanner.c"
 		{
 			gchar* _tmp1_;
+#line 57 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp1_ = g_strdup ("SANE_STATUS_GOOD");
+#line 57 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp1_;
+#line 57 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
+#line 4574 "scanner.c"
 		}
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_UNSUPPORTED:
+#line 4578 "scanner.c"
 		{
 			gchar* _tmp2_;
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp2_ = g_strdup ("SANE_STATUS_UNSUPPORTED");
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp2_;
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
+#line 4587 "scanner.c"
 		}
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_CANCELLED:
+#line 4591 "scanner.c"
 		{
 			gchar* _tmp3_;
+#line 61 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp3_ = g_strdup ("SANE_STATUS_CANCELLED");
+#line 61 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp3_;
+#line 61 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
+#line 4600 "scanner.c"
 		}
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_DEVICE_BUSY:
+#line 4604 "scanner.c"
 		{
 			gchar* _tmp4_;
+#line 63 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp4_ = g_strdup ("SANE_STATUS_DEVICE_BUSY");
+#line 63 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp4_;
+#line 63 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
+#line 4613 "scanner.c"
 		}
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_INVAL:
+#line 4617 "scanner.c"
 		{
 			gchar* _tmp5_;
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp5_ = g_strdup ("SANE_STATUS_INVAL");
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp5_;
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
+#line 4626 "scanner.c"
 		}
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_EOF:
+#line 4630 "scanner.c"
 		{
 			gchar* _tmp6_;
+#line 67 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp6_ = g_strdup ("SANE_STATUS_EOF");
+#line 67 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp6_;
+#line 67 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
+#line 4639 "scanner.c"
 		}
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_JAMMED:
+#line 4643 "scanner.c"
 		{
 			gchar* _tmp7_;
+#line 69 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp7_ = g_strdup ("SANE_STATUS_JAMMED");
+#line 69 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp7_;
+#line 69 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
+#line 4652 "scanner.c"
 		}
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_NO_DOCS:
+#line 4656 "scanner.c"
 		{
 			gchar* _tmp8_;
+#line 71 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp8_ = g_strdup ("SANE_STATUS_NO_DOCS");
+#line 71 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp8_;
+#line 71 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
+#line 4665 "scanner.c"
 		}
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_COVER_OPEN:
+#line 4669 "scanner.c"
 		{
 			gchar* _tmp9_;
+#line 73 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp9_ = g_strdup ("SANE_STATUS_COVER_OPEN");
+#line 73 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp9_;
+#line 73 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
+#line 4678 "scanner.c"
 		}
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_IO_ERROR:
+#line 4682 "scanner.c"
 		{
 			gchar* _tmp10_;
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp10_ = g_strdup ("SANE_STATUS_IO_ERROR");
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp10_;
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
+#line 4691 "scanner.c"
 		}
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_NO_MEM:
+#line 4695 "scanner.c"
 		{
 			gchar* _tmp11_;
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp11_ = g_strdup ("SANE_STATUS_NO_MEM");
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp11_;
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
+#line 4704 "scanner.c"
 		}
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_ACCESS_DENIED:
+#line 4708 "scanner.c"
 		{
 			gchar* _tmp12_;
+#line 79 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp12_ = g_strdup ("SANE_STATUS_ACCESS_DENIED");
+#line 79 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp12_;
+#line 79 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
+#line 4717 "scanner.c"
 		}
 		default:
 		{
 			SANE_Status _tmp13_;
 			gchar* _tmp14_ = NULL;
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp13_ = status;
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp14_ = g_strdup_printf ("SANE_STATUS(%d)", (gint) _tmp13_);
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp14_;
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
+#line 4731 "scanner.c"
 		}
 	}
 }
@@ -3491,9 +4736,13 @@ static gchar* sane_status_to_string (SANE_Status status) {
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
+#line 1242 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
+#line 1242 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
+#line 1242 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
+#line 4746 "scanner.c"
 	{
 		const gchar* _tmp0_;
 		gchar* _tmp1_ = NULL;
@@ -3505,66 +4754,111 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		const gchar* _tmp6_;
 		gchar* _tmp7_ = NULL;
 		gchar* _tmp8_;
+#line 1244 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp0_ = old;
+#line 1244 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
+#line 1244 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp1_;
+#line 1244 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
+#line 1244 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp4_ = _tmp3_;
+#line 1244 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp2_);
+#line 1244 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		regex = _tmp4_;
+#line 1244 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		if (_inner_error_ != NULL) {
+#line 1244 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-				goto __catch13_g_regex_error;
+#line 4776 "scanner.c"
+				goto __catch14_g_regex_error;
 			}
+#line 1244 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 1244 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
+#line 1244 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 			return NULL;
+#line 4785 "scanner.c"
 		}
+#line 1245 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp5_ = regex;
+#line 1245 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp6_ = replacement;
+#line 1245 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp7_ = g_regex_replace_literal (_tmp5_, self, (gssize) (-1), 0, _tmp6_, 0, &_inner_error_);
+#line 1245 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp7_;
+#line 1245 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		if (_inner_error_ != NULL) {
+#line 1245 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
+#line 1245 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-				goto __catch13_g_regex_error;
+#line 4801 "scanner.c"
+				goto __catch14_g_regex_error;
 			}
+#line 1245 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
+#line 1245 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 1245 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
+#line 1245 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 			return NULL;
+#line 4812 "scanner.c"
 		}
+#line 1245 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		result = _tmp8_;
+#line 1245 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
+#line 1245 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		return result;
+#line 4820 "scanner.c"
 	}
-	goto __finally13;
-	__catch13_g_regex_error:
+	goto __finally14;
+	__catch14_g_regex_error:
 	{
 		GError* e = NULL;
+#line 1243 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		e = _inner_error_;
+#line 1243 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
+#line 1247 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
+#line 1243 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
+#line 4834 "scanner.c"
 	}
-	__finally13:
+	__finally14:
+#line 1243 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	if (_inner_error_ != NULL) {
+#line 1243 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 1243 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
+#line 1243 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		return NULL;
+#line 4845 "scanner.c"
 	}
 }
 
 
 static gpointer _scan_device_ref0 (gpointer self) {
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? scan_device_ref (self) : NULL;
+#line 4853 "scanner.c"
 }
 
 
 static gint _scanner_compare_devices_gcompare_func (gconstpointer a, gconstpointer b) {
 	gint result;
 	result = scanner_compare_devices (a, b);
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
+#line 4862 "scanner.c"
 }
 
 
@@ -3584,39 +4878,70 @@ static void scanner_do_redetect (Scanner* self) {
 	GList* _tmp64_;
 	NotifyUpdateDevices* _tmp65_;
 	NotifyUpdateDevices* _tmp66_;
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	device_list = NULL;
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	device_list_length1 = 0;
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_device_list_size_ = device_list_length1;
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = sane_get_devices (&_tmp0_, FALSE);
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	device_list = _tmp0_;
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	device_list_length1 = -1;
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_device_list_size_ = device_list_length1;
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp1_;
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = status;
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = sane_status_to_string (_tmp2_);
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = _tmp3_;
-	g_debug ("scanner.vala:334: sane_get_devices () -> %s", _tmp4_);
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:338: sane_get_devices () -> %s", _tmp4_);
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp4_);
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = status;
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp5_ != SANE_STATUS_GOOD) {
+#line 4914 "scanner.c"
 		SANE_Status _tmp6_;
 		const gchar* _tmp7_ = NULL;
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = status;
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = sane_strstatus (_tmp6_);
-		g_warning ("scanner.vala:337: Unable to get SANE devices: %s", _tmp7_);
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_warning ("scanner.vala:341: Unable to get SANE devices: %s", _tmp7_);
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->need_redetect = FALSE;
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_IDLE;
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
+#line 4929 "scanner.c"
 	}
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	devices = NULL;
+#line 4933 "scanner.c"
 	{
 		gint i;
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		i = 0;
+#line 4938 "scanner.c"
 		{
 			gboolean _tmp8_;
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp8_ = TRUE;
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			while (TRUE) {
+#line 4945 "scanner.c"
 				gboolean _tmp9_;
 				SANE_Device** _tmp11_;
 				gint _tmp11__length1;
@@ -3673,95 +4998,182 @@ static void scanner_do_redetect (Scanner* self) {
 				gchar* _tmp54_;
 				ScanDevice* _tmp55_;
 				ScanDevice* _tmp56_;
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp9_ = _tmp8_;
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp9_) {
+#line 5006 "scanner.c"
 					gint _tmp10_;
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp10_ = i;
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					i = _tmp10_ + 1;
+#line 5012 "scanner.c"
 				}
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp8_ = FALSE;
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp11_ = device_list;
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp11__length1 = device_list_length1;
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp12_ = i;
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp13_ = _tmp11_[_tmp12_];
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!(_tmp13_ != NULL)) {
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
+#line 5028 "scanner.c"
 				}
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp14_ = device_list;
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp14__length1 = device_list_length1;
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp15_ = i;
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp16_ = _tmp14_[_tmp15_];
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp17_ = _tmp16_->name;
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp18_ = device_list;
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp18__length1 = device_list_length1;
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp19_ = i;
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp20_ = _tmp18_[_tmp19_];
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp21_ = _tmp20_->vendor;
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp22_ = device_list;
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp22__length1 = device_list_length1;
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp23_ = i;
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp24_ = _tmp22_[_tmp23_];
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp25_ = _tmp24_->model;
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp26_ = device_list;
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp26__length1 = device_list_length1;
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp27_ = i;
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp28_ = _tmp26_[_tmp27_];
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp29_ = _tmp28_->type;
-				g_debug ("scanner.vala:346: Device: name=\"%s\" vendor=\"%s\" model=\"%s\" type=" \
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				g_debug ("scanner.vala:350: Device: name=\"%s\" vendor=\"%s\" model=\"%s\" type=" \
 "\"%s\"", _tmp17_, _tmp21_, _tmp25_, _tmp29_);
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp30_ = scan_device_new ();
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scan_device = _tmp30_;
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp31_ = scan_device;
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp32_ = device_list;
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp32__length1 = device_list_length1;
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp33_ = i;
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp34_ = _tmp32_[_tmp33_];
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp35_ = _tmp34_->name;
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp36_ = g_strdup (_tmp35_);
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (_tmp31_->name);
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp31_->name = _tmp36_;
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp37_ = device_list;
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp37__length1 = device_list_length1;
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp38_ = i;
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp39_ = _tmp37_[_tmp38_];
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp40_ = _tmp39_->vendor;
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp41_ = g_strdup (_tmp40_);
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				vendor = _tmp41_;
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp42_ = vendor;
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (g_strcmp0 (_tmp42_, "Hewlett-Packard") == 0) {
+#line 5112 "scanner.c"
 					gchar* _tmp43_;
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp43_ = g_strdup ("HP");
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_g_free0 (vendor);
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					vendor = _tmp43_;
+#line 5120 "scanner.c"
 				}
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp44_ = scan_device;
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp45_ = vendor;
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp46_ = device_list;
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp46__length1 = device_list_length1;
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp47_ = i;
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp48_ = _tmp46_[_tmp47_];
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp49_ = _tmp48_->model;
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp50_ = g_strdup_printf ("%s %s", _tmp45_, _tmp49_);
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (_tmp44_->label);
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp44_->label = _tmp50_;
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp51_ = scan_device;
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp52_ = _tmp51_->label;
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp53_ = string_replace (_tmp52_, "_", " ");
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp54_ = _tmp53_;
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (_tmp54_);
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp55_ = scan_device;
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp56_ = _scan_device_ref0 (_tmp55_);
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				devices = g_list_append (devices, _tmp56_);
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (vendor);
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_scan_device_unref0 (scan_device);
+#line 5162 "scanner.c"
 			}
 		}
 	}
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	devices = g_list_sort (devices, _scanner_compare_devices_gcompare_func);
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->need_redetect = FALSE;
+#line 372 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->state = SCAN_STATE_IDLE;
+#line 374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp57_ = devices;
+#line 374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp57_ != NULL) {
+#line 5176 "scanner.c"
 		GList* _tmp58_;
 		gconstpointer _tmp59_ = NULL;
 		ScanDevice* _tmp60_;
@@ -3769,27 +5181,213 @@ static void scanner_do_redetect (Scanner* self) {
 		ScanDevice* _tmp61_;
 		const gchar* _tmp62_;
 		gchar* _tmp63_;
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp58_ = devices;
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp59_ = g_list_nth_data (_tmp58_, (guint) 0);
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp60_ = _scan_device_ref0 ((ScanDevice*) _tmp59_);
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		device = _tmp60_;
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp61_ = device;
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp62_ = _tmp61_->name;
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp63_ = g_strdup (_tmp62_);
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (self->priv->default_device);
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->default_device = _tmp63_;
+#line 374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_device_unref0 (device);
+#line 5204 "scanner.c"
 	} else {
+#line 380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (self->priv->default_device);
+#line 380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->default_device = NULL;
+#line 5210 "scanner.c"
 	}
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp64_ = devices;
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	devices = NULL;
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp65_ = notify_update_devices_new (_tmp64_);
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp66_ = _tmp65_;
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_notify (self, (Notify*) _tmp66_);
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_notify_unref0 (_tmp66_);
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	__g_list_free__scan_device_unref0_0 (devices);
+#line 5226 "scanner.c"
+}
+
+
+static gint scanner_scale_int (Scanner* self, gint source_min, gint source_max, SANE_Option_Descriptor* option, gint value) {
+	gint result = 0;
+	gint _tmp0_;
+	gint v;
+	SANE_Option_Descriptor* _tmp1_;
+	SANE_Value_Type _tmp2_;
+	gint _tmp3_;
+	gboolean _tmp4_ = FALSE;
+	SANE_Option_Descriptor* _tmp5_;
+	SANE_Constraint_Type _tmp6_;
+	gboolean _tmp13_;
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_return_val_if_fail (self != NULL, 0);
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_return_val_if_fail (option != NULL, 0);
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp0_ = value;
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	v = _tmp0_;
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp1_ = option;
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp2_ = _tmp1_->type;
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp3_ = value;
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_return_val_if_fail (_tmp2_ == SANE_TYPE_INT, _tmp3_);
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp5_ = option;
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp6_ = _tmp5_->constraint_type;
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	if (_tmp6_ == SANE_CONSTRAINT_RANGE) {
+#line 5263 "scanner.c"
+		SANE_Option_Descriptor* _tmp7_;
+		SANE_Range* _tmp8_;
+		SANE_Word _tmp9_;
+		SANE_Option_Descriptor* _tmp10_;
+		SANE_Range* _tmp11_;
+		SANE_Word _tmp12_;
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp7_ = option;
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp8_ = _tmp7_->constraint.range;
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp9_ = _tmp8_->max;
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp10_ = option;
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp11_ = _tmp10_->constraint.range;
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp12_ = _tmp11_->min;
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp4_ = _tmp9_ != _tmp12_;
+#line 5284 "scanner.c"
+	} else {
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp4_ = FALSE;
+#line 5288 "scanner.c"
+	}
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp13_ = _tmp4_;
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	if (_tmp13_) {
+#line 5294 "scanner.c"
+		gint _tmp14_;
+		gint _tmp15_;
+		gint _tmp16_;
+		SANE_Option_Descriptor* _tmp17_;
+		SANE_Range* _tmp18_;
+		SANE_Word _tmp19_;
+		SANE_Option_Descriptor* _tmp20_;
+		SANE_Range* _tmp21_;
+		SANE_Word _tmp22_;
+		gint _tmp23_;
+		gint _tmp24_;
+		gint _tmp25_;
+		gint _tmp26_;
+		SANE_Option_Descriptor* _tmp27_;
+		SANE_Range* _tmp28_;
+		SANE_Word _tmp29_;
+		gint _tmp30_;
+		gint _tmp31_;
+		gint _tmp32_;
+		gint _tmp33_;
+		SANE_Option_Descriptor* _tmp34_;
+		SANE_Range* _tmp35_;
+		SANE_Word _tmp36_;
+		SANE_Option_Descriptor* _tmp37_;
+		SANE_Range* _tmp38_;
+		SANE_Word _tmp39_;
+#line 393 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp14_ = v;
+#line 393 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp15_ = source_min;
+#line 393 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		v = _tmp14_ - _tmp15_;
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp16_ = v;
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp17_ = option;
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp18_ = _tmp17_->constraint.range;
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp19_ = _tmp18_->max;
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp20_ = option;
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp21_ = _tmp20_->constraint.range;
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp22_ = _tmp21_->min;
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		v = _tmp16_ * ((gint) (_tmp19_ - _tmp22_));
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp23_ = v;
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp24_ = source_max;
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp25_ = source_min;
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		v = _tmp23_ / (_tmp24_ - _tmp25_);
+#line 396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp26_ = v;
+#line 396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp27_ = option;
+#line 396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp28_ = _tmp27_->constraint.range;
+#line 396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp29_ = _tmp28_->min;
+#line 396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		v = _tmp26_ + ((gint) _tmp29_);
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp30_ = value;
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp31_ = source_min;
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp32_ = source_max;
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp33_ = v;
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp34_ = option;
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp35_ = _tmp34_->constraint.range;
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp36_ = _tmp35_->min;
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp37_ = option;
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp38_ = _tmp37_->constraint.range;
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp39_ = _tmp38_->max;
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_debug ("scanner.vala:397: scale_int: scaling %d [min: %d, max: %d] to %d [min:" \
+" %d, max: %d]", _tmp30_, _tmp31_, _tmp32_, _tmp33_, (gint) _tmp36_, (gint) _tmp39_);
+#line 5383 "scanner.c"
+	}
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	result = v;
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	return result;
+#line 5389 "scanner.c"
 }
 
 
@@ -3807,39 +5405,70 @@ static gboolean scanner_set_default_option (Scanner* self, SANE_Handle handle, S
 	gchar* _tmp8_;
 	SANE_Status _tmp9_;
 	SANE_Status _tmp14_;
+#line 404 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
+#line 404 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (option != NULL, FALSE);
+#line 407 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = option;
+#line 407 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->cap;
+#line 407 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if ((_tmp1_ & SANE_CAP_AUTOMATIC) == ((SANE_Int) 0)) {
+#line 408 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		result = FALSE;
+#line 408 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
+#line 5421 "scanner.c"
 	}
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = handle;
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = option_index;
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = sane_control_option (_tmp2_, _tmp3_, SANE_ACTION_SET_AUTO, NULL, NULL);
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp4_;
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = option_index;
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = status;
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = sane_status_to_string (_tmp6_);
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = _tmp7_;
-	g_debug ("scanner.vala:388: sane_control_option (%d, SANE_ACTION_SET_AUTO) -> %s", (gint) _tmp5_, _tmp8_);
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:411: sane_control_option (%d, SANE_ACTION_SET_AUTO) -> %s", (gint) _tmp5_, _tmp8_);
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp8_);
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp9_ = status;
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp9_ != SANE_STATUS_GOOD) {
+#line 5447 "scanner.c"
 		SANE_Option_Descriptor* _tmp10_;
 		const gchar* _tmp11_;
 		SANE_Status _tmp12_;
 		const gchar* _tmp13_ = NULL;
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp10_ = option;
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp11_ = _tmp10_->name;
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp12_ = status;
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp13_ = sane_strstatus (_tmp12_);
-		g_warning ("scanner.vala:390: Error setting default option %s: %s", _tmp11_, _tmp13_);
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_warning ("scanner.vala:413: Error setting default option %s: %s", _tmp11_, _tmp13_);
+#line 5462 "scanner.c"
 	}
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp14_ = status;
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = _tmp14_ == SANE_STATUS_GOOD;
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
+#line 5470 "scanner.c"
 }
 
 
@@ -3864,42 +5493,78 @@ static void scanner_set_bool_option (Scanner* self, SANE_Handle handle, SANE_Opt
 	gchar* _tmp14_ = NULL;
 	gchar* _tmp15_;
 	const gchar* _tmp16_;
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (option != NULL);
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = option;
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->type;
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (_tmp1_ == SANE_TYPE_BOOL);
+#line 422 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = value;
+#line 422 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	v = (SANE_Bool) _tmp2_;
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = handle;
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = option_index;
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = sane_control_option (_tmp3_, _tmp4_, SANE_ACTION_SET_VALUE, &v, NULL);
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp5_;
+#line 424 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = v;
+#line 424 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_vala_result = (gboolean) _tmp6_;
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = value;
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp8_) {
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = "SANE_TRUE";
+#line 5527 "scanner.c"
 	} else {
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = "SANE_FALSE";
+#line 5531 "scanner.c"
 	}
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = _vala_result;
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp10_) {
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = "SANE_TRUE";
+#line 5539 "scanner.c"
 	} else {
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = "SANE_FALSE";
+#line 5543 "scanner.c"
 	}
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = option_index;
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp12_ = _tmp7_;
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp13_ = status;
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp14_ = sane_status_to_string (_tmp13_);
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp15_ = _tmp14_;
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp16_ = _tmp9_;
-	g_debug ("scanner.vala:402: sane_control_option (%d, SANE_ACTION_SET_VALUE, %s) " \
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:425: sane_control_option (%d, SANE_ACTION_SET_VALUE, %s) " \
 "-> (%s, %s)", (gint) _tmp11_, _tmp12_, _tmp15_, _tmp16_);
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp15_);
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_result_) {
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
+#line 5565 "scanner.c"
 	}
 }
 
@@ -3922,16 +5587,27 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 	gchar* _tmp55_;
 	SANE_Int _tmp56_;
 	SANE_Int _tmp57_;
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (option != NULL);
+#line 430 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = option;
+#line 430 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->type;
+#line 430 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (_tmp1_ == SANE_TYPE_INT);
+#line 432 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = value;
+#line 432 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	v = (SANE_Int) _tmp2_;
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = option;
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = _tmp3_->constraint_type;
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp4_ == SANE_CONSTRAINT_RANGE) {
+#line 5608 "scanner.c"
 		SANE_Option_Descriptor* _tmp5_;
 		SANE_Range* _tmp6_;
 		SANE_Word _tmp7_;
@@ -3943,66 +5619,112 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 		SANE_Option_Descriptor* _tmp20_;
 		SANE_Range* _tmp21_;
 		SANE_Word _tmp22_;
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp5_ = option;
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = _tmp5_->constraint.range;
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = _tmp6_->quant;
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp7_ != ((SANE_Word) 0)) {
+#line 5628 "scanner.c"
 			SANE_Int _tmp8_;
 			SANE_Option_Descriptor* _tmp9_;
 			SANE_Range* _tmp10_;
 			SANE_Word _tmp11_;
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp8_ = v;
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp9_ = option;
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp10_ = _tmp9_->constraint.range;
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp11_ = _tmp10_->quant;
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = _tmp8_ * _tmp11_;
+#line 5643 "scanner.c"
 		}
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp12_ = v;
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp13_ = option;
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = _tmp13_->constraint.range;
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp15_ = _tmp14_->min;
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp12_ < ((SANE_Int) _tmp15_)) {
+#line 5655 "scanner.c"
 			SANE_Option_Descriptor* _tmp16_;
 			SANE_Range* _tmp17_;
 			SANE_Word _tmp18_;
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp16_ = option;
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp17_ = _tmp16_->constraint.range;
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp18_ = _tmp17_->min;
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = (SANE_Int) _tmp18_;
+#line 5667 "scanner.c"
 		}
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp19_ = v;
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp20_ = option;
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp21_ = _tmp20_->constraint.range;
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp22_ = _tmp21_->max;
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp19_ > ((SANE_Int) _tmp22_)) {
+#line 5679 "scanner.c"
 			SANE_Option_Descriptor* _tmp23_;
 			SANE_Range* _tmp24_;
 			SANE_Word _tmp25_;
+#line 440 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp23_ = option;
+#line 440 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp24_ = _tmp23_->constraint.range;
+#line 440 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp25_ = _tmp24_->max;
+#line 440 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = (SANE_Int) _tmp25_;
+#line 5691 "scanner.c"
 		}
 	} else {
 		SANE_Option_Descriptor* _tmp26_;
 		SANE_Constraint_Type _tmp27_;
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp26_ = option;
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp27_ = _tmp26_->constraint_type;
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp27_ == SANE_CONSTRAINT_WORD_LIST) {
+#line 5702 "scanner.c"
 			gint _tmp28_;
 			gint distance;
 			gint nearest;
 			gint _tmp48_;
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp28_ = G_MAXINT;
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			distance = _tmp28_;
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			nearest = 0;
+#line 5713 "scanner.c"
 			{
 				gint i;
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
+#line 5718 "scanner.c"
 				{
 					gboolean _tmp29_;
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp29_ = TRUE;
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
+#line 5725 "scanner.c"
 						gboolean _tmp30_;
 						gint _tmp32_;
 						SANE_Option_Descriptor* _tmp33_;
@@ -4022,66 +5744,121 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 						gint _tmp43_ = 0;
 						gint _tmp44_;
 						gint _tmp45_;
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp30_ = _tmp29_;
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp30_) {
+#line 5749 "scanner.c"
 							gint _tmp31_;
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp31_ = i;
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							i = _tmp31_ + 1;
+#line 5755 "scanner.c"
 						}
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp29_ = FALSE;
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp32_ = i;
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp33_ = option;
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp34_ = _tmp33_->constraint.word_list;
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp34__length1 = -1;
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp35_ = _tmp34_[0];
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!(((SANE_Word) _tmp32_) < _tmp35_)) {
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
+#line 5773 "scanner.c"
 						}
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp36_ = option;
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp37_ = _tmp36_->constraint.word_list;
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp37__length1 = -1;
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp38_ = i;
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp39_ = _tmp37_[_tmp38_ + 1];
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						x = (gint) _tmp39_;
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp40_ = x;
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp41_ = v;
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						d = (gint) (_tmp40_ - _tmp41_);
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp42_ = d;
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp43_ = abs (_tmp42_);
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						d = _tmp43_;
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp44_ = d;
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp45_ = distance;
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp44_ < _tmp45_) {
+#line 5805 "scanner.c"
 							gint _tmp46_;
 							gint _tmp47_;
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp46_ = d;
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							distance = _tmp46_;
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp47_ = x;
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							nearest = _tmp47_;
+#line 5816 "scanner.c"
 						}
 					}
 				}
 			}
+#line 458 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp48_ = nearest;
+#line 458 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = (SANE_Int) _tmp48_;
+#line 5825 "scanner.c"
 		}
 	}
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp49_ = handle;
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp50_ = option_index;
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp51_ = sane_control_option (_tmp49_, _tmp50_, SANE_ACTION_SET_VALUE, &v, NULL);
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp51_;
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp52_ = option_index;
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp53_ = value;
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp54_ = sane_status_to_string (status);
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp55_ = _tmp54_;
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp56_ = v;
-	g_debug ("scanner.vala:439: sane_control_option (%d, SANE_ACTION_SET_VALUE, %d) " \
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:462: sane_control_option (%d, SANE_ACTION_SET_VALUE, %d) " \
 "-> (%s, %d)", (gint) _tmp52_, _tmp53_, _tmp55_, (gint) _tmp56_);
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp55_);
+#line 463 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp57_ = v;
+#line 463 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_vala_result = (gint) _tmp57_;
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_result_) {
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
+#line 5858 "scanner.c"
 	}
 }
 
@@ -4107,16 +5884,27 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 	gchar* _tmp51_;
 	gdouble _tmp52_ = 0.0;
 	gdouble _tmp53_ = 0.0;
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (option != NULL);
+#line 468 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = value;
+#line 468 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	v = _tmp0_;
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = option;
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _tmp1_->type;
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (_tmp2_ == SANE_TYPE_FIXED);
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = option;
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = _tmp3_->constraint_type;
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp4_ == SANE_CONSTRAINT_RANGE) {
+#line 5904 "scanner.c"
 		SANE_Option_Descriptor* _tmp5_;
 		SANE_Range* _tmp6_;
 		SANE_Word _tmp7_;
@@ -4131,50 +5919,87 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 		gdouble _tmp14_;
 		gdouble _tmp16_;
 		gdouble _tmp17_;
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp5_ = option;
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = _tmp5_->constraint.range;
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = _tmp6_->min;
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = SANE_UNFIX ((SANE_Fixed) _tmp7_);
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		min = _tmp8_;
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = option;
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp10_ = _tmp9_->constraint.range;
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp11_ = _tmp10_->max;
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp12_ = SANE_UNFIX ((SANE_Fixed) _tmp11_);
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		max = _tmp12_;
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp13_ = v;
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = min;
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp13_ < _tmp14_) {
+#line 5945 "scanner.c"
 			gdouble _tmp15_;
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp15_ = min;
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = _tmp15_;
+#line 5951 "scanner.c"
 		}
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp16_ = v;
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp17_ = max;
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp16_ > _tmp17_) {
+#line 5959 "scanner.c"
 			gdouble _tmp18_;
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp18_ = max;
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = _tmp18_;
+#line 5965 "scanner.c"
 		}
 	} else {
 		SANE_Option_Descriptor* _tmp19_;
 		SANE_Constraint_Type _tmp20_;
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp19_ = option;
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp20_ = _tmp19_->constraint_type;
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp20_ == SANE_CONSTRAINT_WORD_LIST) {
+#line 5976 "scanner.c"
 			gdouble _tmp21_;
 			gdouble distance;
 			gdouble nearest;
 			gdouble _tmp42_;
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp21_ = DBL_MAX;
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			distance = _tmp21_;
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			nearest = 0.0;
+#line 5987 "scanner.c"
 			{
 				gint i;
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
+#line 5992 "scanner.c"
 				{
 					gboolean _tmp22_;
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp22_ = TRUE;
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
+#line 5999 "scanner.c"
 						gboolean _tmp23_;
 						gint _tmp25_;
 						SANE_Option_Descriptor* _tmp26_;
@@ -4192,70 +6017,127 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 						gdouble _tmp35_;
 						gdouble _tmp36_ = 0.0;
 						gdouble _tmp37_;
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp23_ = _tmp22_;
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp23_) {
+#line 6021 "scanner.c"
 							gint _tmp24_;
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp24_ = i;
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							i = _tmp24_ + 1;
+#line 6027 "scanner.c"
 						}
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp22_ = FALSE;
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp25_ = i;
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp26_ = option;
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp27_ = _tmp26_->constraint.word_list;
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp27__length1 = -1;
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp28_ = _tmp27_[0];
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!(((SANE_Word) _tmp25_) < _tmp28_)) {
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
+#line 6045 "scanner.c"
 						}
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp29_ = option;
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp30_ = _tmp29_->constraint.word_list;
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp30__length1 = -1;
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp31_ = i;
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp32_ = _tmp30_[_tmp31_ + 1];
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp33_ = SANE_UNFIX ((SANE_Fixed) _tmp32_);
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						x = _tmp33_;
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp34_ = x;
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp35_ = v;
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp36_ = fabs (_tmp34_ - _tmp35_);
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp37_ = distance;
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp36_ < _tmp37_) {
+#line 6071 "scanner.c"
 							gdouble _tmp38_;
 							gdouble _tmp39_;
 							gdouble _tmp40_ = 0.0;
 							gdouble _tmp41_;
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp38_ = x;
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp39_ = v;
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp40_ = fabs (_tmp38_ - _tmp39_);
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							distance = _tmp40_;
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp41_ = x;
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							nearest = _tmp41_;
+#line 6088 "scanner.c"
 						}
 					}
 				}
 			}
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp42_ = nearest;
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = _tmp42_;
+#line 6097 "scanner.c"
 		}
 	}
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp43_ = v;
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp44_ = SANE_FIX (_tmp43_);
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	v_fixed = _tmp44_;
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp45_ = handle;
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp46_ = option_index;
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp47_ = sane_control_option (_tmp45_, _tmp46_, SANE_ACTION_SET_VALUE, &v_fixed, NULL);
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp47_;
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp48_ = option_index;
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp49_ = value;
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp50_ = sane_status_to_string (status);
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp51_ = _tmp50_;
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp52_ = SANE_UNFIX (v_fixed);
-	g_debug ("scanner.vala:479: sane_control_option (%d, SANE_ACTION_SET_VALUE, %f) " \
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:502: sane_control_option (%d, SANE_ACTION_SET_VALUE, %f) " \
 "-> (%s, %f)", (gint) _tmp48_, _tmp49_, _tmp51_, _tmp52_);
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp51_);
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp53_ = SANE_UNFIX (v_fixed);
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_vala_result = _tmp53_;
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_result_) {
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
+#line 6136 "scanner.c"
 	}
 }
 
@@ -4264,11 +6146,17 @@ static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
 	glong _tmp0_;
 	gchar _tmp1_;
+#line 965 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
+#line 966 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
+#line 966 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
+#line 966 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	result = _tmp1_;
+#line 966 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	return result;
+#line 6155 "scanner.c"
 }
 
 
@@ -4303,26 +6191,46 @@ static gboolean scanner_set_string_option (Scanner* self, SANE_Handle handle, SA
 	gchar* _tmp34_ = NULL;
 	gchar* _tmp35_;
 	const gchar* _tmp36_;
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (option != NULL, FALSE);
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (value != NULL, FALSE);
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = g_strdup ("");
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_vala_result);
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_vala_result = _tmp0_;
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = option;
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _tmp1_->type;
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (_tmp2_ == SANE_TYPE_STRING, FALSE);
+#line 513 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = option;
+#line 513 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = _tmp3_->size;
+#line 513 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = g_new0 (gchar, _tmp4_);
+#line 513 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	s = _tmp5_;
+#line 513 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	s_length1 = _tmp4_;
+#line 513 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_s_size_ = s_length1;
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	i = 0;
+#line 6222 "scanner.c"
 	{
 		gboolean _tmp6_;
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = TRUE;
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		while (TRUE) {
+#line 6229 "scanner.c"
 			gboolean _tmp7_;
 			gboolean _tmp9_ = FALSE;
 			gint _tmp10_;
@@ -4336,73 +6244,137 @@ static gboolean scanner_set_string_option (Scanner* self, SANE_Handle handle, SA
 			gint _tmp20_;
 			gchar _tmp21_ = '\0';
 			gchar _tmp22_;
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp7_ = _tmp6_;
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (!_tmp7_) {
+#line 6247 "scanner.c"
 				gint _tmp8_;
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp8_ = i;
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = _tmp8_ + 1;
+#line 6253 "scanner.c"
 			}
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp6_ = FALSE;
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp10_ = i;
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp11_ = option;
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp12_ = _tmp11_->size;
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (((SANE_Int) _tmp10_) < (_tmp12_ - 1)) {
+#line 6265 "scanner.c"
 				const gchar* _tmp13_;
 				gint _tmp14_;
 				gchar _tmp15_ = '\0';
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp13_ = value;
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp14_ = i;
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp15_ = string_get (_tmp13_, (glong) _tmp14_);
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp9_ = _tmp15_ != '\0';
+#line 6277 "scanner.c"
 			} else {
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp9_ = FALSE;
+#line 6281 "scanner.c"
 			}
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp16_ = _tmp9_;
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (!_tmp16_) {
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
+#line 6289 "scanner.c"
 			}
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp17_ = s;
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp17__length1 = s_length1;
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp18_ = i;
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp19_ = value;
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp20_ = i;
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp21_ = string_get (_tmp19_, (glong) _tmp20_);
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp17_[_tmp18_] = _tmp21_;
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp22_ = _tmp17_[_tmp18_];
+#line 6307 "scanner.c"
 		}
 	}
+#line 517 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp23_ = s;
+#line 517 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp23__length1 = s_length1;
+#line 517 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp24_ = i;
+#line 517 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp23_[_tmp24_] = '\0';
+#line 517 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp25_ = _tmp23_[_tmp24_];
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp26_ = handle;
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp27_ = option_index;
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp28_ = s;
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp28__length1 = s_length1;
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp29_ = sane_control_option (_tmp26_, _tmp27_, SANE_ACTION_SET_VALUE, _tmp28_, NULL);
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp29_;
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp30_ = s;
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp30__length1 = s_length1;
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp31_ = g_strdup ((const gchar*) _tmp30_);
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_vala_result);
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_vala_result = _tmp31_;
+#line 520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp32_ = option_index;
+#line 520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp33_ = value;
+#line 520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp34_ = sane_status_to_string (status);
+#line 520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp35_ = _tmp34_;
+#line 520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp36_ = _vala_result;
-	g_debug ("scanner.vala:497: sane_control_option (%d, SANE_ACTION_SET_VALUE, \"%s" \
+#line 520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:520: sane_control_option (%d, SANE_ACTION_SET_VALUE, \"%s" \
 "\") -> (%s, \"%s\")", (gint) _tmp32_, _tmp33_, _tmp35_, _tmp36_);
+#line 520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp35_);
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = status == SANE_STATUS_GOOD;
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	s = (g_free (s), NULL);
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_result_) {
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
+#line 6364 "scanner.c"
 	} else {
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (_vala_result);
+#line 6368 "scanner.c"
 	}
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
+#line 6372 "scanner.c"
 }
 
 
@@ -4414,21 +6386,35 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 	SANE_Option_Descriptor* _tmp2_;
 	SANE_Constraint_Type _tmp3_;
 	gchar* _tmp36_;
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (option != NULL, FALSE);
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = option;
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->type;
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (_tmp1_ == SANE_TYPE_STRING, FALSE);
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = option;
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _tmp2_->constraint_type;
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (_tmp3_ == SANE_CONSTRAINT_STRING_LIST, FALSE);
+#line 6400 "scanner.c"
 	{
 		gint i;
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		i = 0;
+#line 6405 "scanner.c"
 		{
 			gboolean _tmp4_;
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = TRUE;
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			while (TRUE) {
+#line 6412 "scanner.c"
 				gboolean _tmp5_;
 				gchar** _tmp7_;
 				gint _tmp7__length1;
@@ -4440,25 +6426,44 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 				gint _tmp25__length1;
 				gint _tmp26_;
 				const gchar* _tmp27_;
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp5_ = _tmp4_;
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp5_) {
+#line 6428 "scanner.c"
 					gint _tmp6_;
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp6_ = i;
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					i = _tmp6_ + 1;
+#line 6434 "scanner.c"
 				}
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp4_ = FALSE;
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp7_ = values;
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp7__length1 = values_length1;
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp8_ = i;
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp9_ = _tmp7_[_tmp8_];
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!(_tmp9_ != NULL)) {
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
+#line 6450 "scanner.c"
 				}
+#line 532 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				j = 0;
+#line 6454 "scanner.c"
 				{
 					gboolean _tmp10_;
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp10_ = TRUE;
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
+#line 6461 "scanner.c"
 						gboolean _tmp11_;
 						SANE_Option_Descriptor* _tmp13_;
 						gchar** _tmp14_;
@@ -4474,41 +6479,75 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 						gint _tmp21__length1;
 						gint _tmp22_;
 						const gchar* _tmp23_;
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp11_ = _tmp10_;
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp11_) {
+#line 6481 "scanner.c"
 							gint _tmp12_;
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp12_ = j;
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							j = _tmp12_ + 1;
+#line 6487 "scanner.c"
 						}
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp10_ = FALSE;
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp13_ = option;
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp14_ = _tmp13_->constraint.string_list;
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp14__length1 = -1;
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp15_ = j;
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp16_ = _tmp14_[_tmp15_];
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!(_tmp16_ != NULL)) {
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
+#line 6505 "scanner.c"
 						}
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp17_ = values;
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp17__length1 = values_length1;
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp18_ = i;
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp19_ = _tmp17_[_tmp18_];
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp20_ = option;
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp21_ = _tmp20_->constraint.string_list;
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp21__length1 = -1;
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp22_ = j;
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp23_ = _tmp21_[_tmp22_];
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (g_strcmp0 (_tmp19_, _tmp23_) == 0) {
+#line 536 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
+#line 6529 "scanner.c"
 						}
 					}
 				}
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp24_ = option;
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp25_ = _tmp24_->constraint.string_list;
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp25__length1 = -1;
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp26_ = j;
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp27_ = _tmp25_[_tmp26_];
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (_tmp27_ != NULL) {
+#line 6545 "scanner.c"
 					SANE_Handle _tmp28_;
 					SANE_Option_Descriptor* _tmp29_;
 					SANE_Int _tmp30_;
@@ -4518,37 +6557,66 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 					const gchar* _tmp33_;
 					gchar* _tmp34_ = NULL;
 					gboolean _tmp35_ = FALSE;
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp28_ = handle;
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp29_ = option;
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp30_ = option_index;
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp31_ = values;
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp31__length1 = values_length1;
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp32_ = i;
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp33_ = _tmp31_[_tmp32_];
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp35_ = scanner_set_string_option (self, _tmp28_, _tmp29_, _tmp30_, _tmp33_, &_tmp34_);
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_g_free0 (_vala_result);
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_vala_result = _tmp34_;
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					result = _tmp35_;
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (_result_) {
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						*_result_ = _vala_result;
+#line 6581 "scanner.c"
 					} else {
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_g_free0 (_vala_result);
+#line 6585 "scanner.c"
 					}
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					return result;
+#line 6589 "scanner.c"
 				}
 			}
 		}
 	}
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp36_ = g_strdup ("");
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_vala_result);
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_vala_result = _tmp36_;
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = FALSE;
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_result_) {
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
+#line 6606 "scanner.c"
 	} else {
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (_vala_result);
+#line 6610 "scanner.c"
 	}
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
+#line 6614 "scanner.c"
 }
 
 
@@ -4579,111 +6647,195 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 	const gchar* _tmp214_;
 	SANE_Option_Descriptor* _tmp215_;
 	const gchar* _tmp216_;
+#line 547 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
+#line 547 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (option != NULL);
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = index;
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = g_strdup_printf ("Option %d:", (gint) _tmp0_);
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	s = _tmp1_;
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = option;
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _tmp2_->name;
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_strcmp0 (_tmp3_, "") != 0) {
+#line 6661 "scanner.c"
 		const gchar* _tmp4_;
 		SANE_Option_Descriptor* _tmp5_;
 		const gchar* _tmp6_;
 		gchar* _tmp7_ = NULL;
 		gchar* _tmp8_;
 		gchar* _tmp9_;
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = s;
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp5_ = option;
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = _tmp5_->name;
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = g_strdup_printf (" name='%s'", _tmp6_);
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = _tmp7_;
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = g_strconcat (_tmp4_, _tmp8_, NULL);
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (s);
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		s = _tmp9_;
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (_tmp8_);
+#line 6686 "scanner.c"
 	}
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = option;
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = _tmp10_->title;
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_strcmp0 (_tmp11_, "") != 0) {
+#line 6694 "scanner.c"
 		const gchar* _tmp12_;
 		SANE_Option_Descriptor* _tmp13_;
 		const gchar* _tmp14_;
 		gchar* _tmp15_ = NULL;
 		gchar* _tmp16_;
 		gchar* _tmp17_;
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp12_ = s;
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp13_ = option;
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = _tmp13_->title;
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp15_ = g_strdup_printf (" title='%s'", _tmp14_);
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp16_ = _tmp15_;
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp17_ = g_strconcat (_tmp12_, _tmp16_, NULL);
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (s);
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		s = _tmp17_;
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (_tmp16_);
+#line 6719 "scanner.c"
 	}
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp18_ = option;
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp19_ = _tmp18_->type;
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	switch (_tmp19_) {
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_BOOL:
+#line 6729 "scanner.c"
 		{
 			const gchar* _tmp20_;
 			gchar* _tmp21_;
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp20_ = s;
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp21_ = g_strconcat (_tmp20_, " type=bool", NULL);
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp21_;
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
+#line 6743 "scanner.c"
 		}
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_INT:
+#line 6747 "scanner.c"
 		{
 			const gchar* _tmp22_;
 			gchar* _tmp23_;
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp22_ = s;
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp23_ = g_strconcat (_tmp22_, " type=int", NULL);
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp23_;
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
+#line 6761 "scanner.c"
 		}
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_FIXED:
+#line 6765 "scanner.c"
 		{
 			const gchar* _tmp24_;
 			gchar* _tmp25_;
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp24_ = s;
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp25_ = g_strconcat (_tmp24_, " type=fixed", NULL);
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp25_;
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
+#line 6779 "scanner.c"
 		}
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_STRING:
+#line 6783 "scanner.c"
 		{
 			const gchar* _tmp26_;
 			gchar* _tmp27_;
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp26_ = s;
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp27_ = g_strconcat (_tmp26_, " type=string", NULL);
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp27_;
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
+#line 6797 "scanner.c"
 		}
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_BUTTON:
+#line 6801 "scanner.c"
 		{
 			const gchar* _tmp28_;
 			gchar* _tmp29_;
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp28_ = s;
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_ = g_strconcat (_tmp28_, " type=button", NULL);
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp29_;
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
+#line 6815 "scanner.c"
 		}
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_GROUP:
+#line 6819 "scanner.c"
 		{
 			const gchar* _tmp30_;
 			gchar* _tmp31_;
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp30_ = s;
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp31_ = g_strconcat (_tmp30_, " type=group", NULL);
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp31_;
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
+#line 6833 "scanner.c"
 		}
 		default:
 		{
@@ -4693,93 +6845,168 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			gchar* _tmp35_ = NULL;
 			gchar* _tmp36_;
 			gchar* _tmp37_;
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp32_ = s;
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp33_ = option;
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp34_ = _tmp33_->type;
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp35_ = g_strdup_printf (" type=%d", (gint) _tmp34_);
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp36_ = _tmp35_;
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp37_ = g_strconcat (_tmp32_, _tmp36_, NULL);
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp37_;
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (_tmp36_);
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
+#line 6863 "scanner.c"
 		}
 	}
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp38_ = s;
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp39_ = option;
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp40_ = _tmp39_->size;
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp41_ = g_strdup_printf (" size=%d", (gint) _tmp40_);
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp42_ = _tmp41_;
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp43_ = g_strconcat (_tmp38_, _tmp42_, NULL);
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (s);
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	s = _tmp43_;
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp42_);
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp44_ = option;
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp45_ = _tmp44_->unit;
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	switch (_tmp45_) {
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_NONE:
+#line 6892 "scanner.c"
 		{
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
+#line 6896 "scanner.c"
 		}
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_PIXEL:
+#line 6900 "scanner.c"
 		{
 			const gchar* _tmp46_;
 			gchar* _tmp47_;
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp46_ = s;
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp47_ = g_strconcat (_tmp46_, " unit=pixels", NULL);
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp47_;
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
+#line 6914 "scanner.c"
 		}
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_BIT:
+#line 6918 "scanner.c"
 		{
 			const gchar* _tmp48_;
 			gchar* _tmp49_;
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp48_ = s;
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp49_ = g_strconcat (_tmp48_, " unit=bits", NULL);
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp49_;
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
+#line 6932 "scanner.c"
 		}
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_MM:
+#line 6936 "scanner.c"
 		{
 			const gchar* _tmp50_;
 			gchar* _tmp51_;
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp50_ = s;
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp51_ = g_strconcat (_tmp50_, " unit=mm", NULL);
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp51_;
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
+#line 6950 "scanner.c"
 		}
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_DPI:
+#line 6954 "scanner.c"
 		{
 			const gchar* _tmp52_;
 			gchar* _tmp53_;
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp52_ = s;
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp53_ = g_strconcat (_tmp52_, " unit=dpi", NULL);
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp53_;
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
+#line 6968 "scanner.c"
 		}
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_PERCENT:
+#line 6972 "scanner.c"
 		{
 			const gchar* _tmp54_;
 			gchar* _tmp55_;
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp54_ = s;
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp55_ = g_strconcat (_tmp54_, " unit=percent", NULL);
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp55_;
+#line 602 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
+#line 6986 "scanner.c"
 		}
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_MICROSECOND:
+#line 6990 "scanner.c"
 		{
 			const gchar* _tmp56_;
 			gchar* _tmp57_;
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp56_ = s;
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp57_ = g_strconcat (_tmp56_, " unit=microseconds", NULL);
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp57_;
+#line 605 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
+#line 7004 "scanner.c"
 		}
 		default:
 		{
@@ -4789,28 +7016,48 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			gchar* _tmp61_ = NULL;
 			gchar* _tmp62_;
 			gchar* _tmp63_;
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp58_ = s;
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp59_ = option;
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp60_ = _tmp59_->unit;
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp61_ = g_strdup_printf (" unit=%d", (gint) _tmp60_);
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp62_ = _tmp61_;
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp63_ = g_strconcat (_tmp58_, _tmp62_, NULL);
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp63_;
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (_tmp62_);
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
+#line 7034 "scanner.c"
 		}
 	}
+#line 611 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp64_ = option;
+#line 611 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp65_ = _tmp64_->constraint_type;
+#line 611 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	switch (_tmp65_) {
+#line 611 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_CONSTRAINT_RANGE:
+#line 7045 "scanner.c"
 		{
 			SANE_Option_Descriptor* _tmp66_;
 			SANE_Value_Type _tmp67_;
+#line 614 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp66_ = option;
+#line 614 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp67_ = _tmp66_->type;
+#line 614 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp67_ == SANE_TYPE_FIXED) {
+#line 7055 "scanner.c"
 				const gchar* _tmp68_;
 				SANE_Option_Descriptor* _tmp69_;
 				SANE_Range* _tmp70_;
@@ -4826,24 +7073,43 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 				gchar* _tmp80_ = NULL;
 				gchar* _tmp81_;
 				gchar* _tmp82_;
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp68_ = s;
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp69_ = option;
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp70_ = _tmp69_->constraint.range;
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp71_ = _tmp70_->min;
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp72_ = SANE_UNFIX ((SANE_Fixed) _tmp71_);
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp73_ = option;
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp74_ = _tmp73_->constraint.range;
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp75_ = _tmp74_->max;
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp76_ = SANE_UNFIX ((SANE_Fixed) _tmp75_);
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp77_ = option;
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp78_ = _tmp77_->constraint.range;
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp79_ = _tmp78_->quant;
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp80_ = g_strdup_printf (" min=%f, max=%f, quant=%d", _tmp72_, _tmp76_, (gint) _tmp79_);
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp81_ = _tmp80_;
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp82_ = g_strconcat (_tmp68_, _tmp81_, NULL);
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp82_;
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (_tmp81_);
+#line 7107 "scanner.c"
 			} else {
 				const gchar* _tmp83_;
 				SANE_Option_Descriptor* _tmp84_;
@@ -4858,42 +7124,73 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 				gchar* _tmp93_ = NULL;
 				gchar* _tmp94_;
 				gchar* _tmp95_;
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp83_ = s;
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp84_ = option;
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp85_ = _tmp84_->constraint.range;
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp86_ = _tmp85_->min;
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp87_ = option;
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp88_ = _tmp87_->constraint.range;
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp89_ = _tmp88_->max;
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp90_ = option;
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp91_ = _tmp90_->constraint.range;
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp92_ = _tmp91_->quant;
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp93_ = g_strdup_printf (" min=%d, max=%d, quant=%d", (gint) _tmp86_, (gint) _tmp89_, (gint) _tmp92_);
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp94_ = _tmp93_;
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp95_ = g_strconcat (_tmp83_, _tmp94_, NULL);
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp95_;
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (_tmp94_);
+#line 7154 "scanner.c"
 			}
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
+#line 7158 "scanner.c"
 		}
+#line 611 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_CONSTRAINT_WORD_LIST:
+#line 7162 "scanner.c"
 		{
 			const gchar* _tmp96_;
 			gchar* _tmp97_;
 			const gchar* _tmp127_;
 			gchar* _tmp128_;
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp96_ = s;
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp97_ = g_strconcat (_tmp96_, " values=[", NULL);
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp97_;
+#line 7176 "scanner.c"
 			{
 				gint i;
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
+#line 7181 "scanner.c"
 				{
 					gboolean _tmp98_;
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp98_ = TRUE;
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
+#line 7188 "scanner.c"
 						gboolean _tmp99_;
 						gint _tmp101_;
 						SANE_Option_Descriptor* _tmp102_;
@@ -4903,33 +7200,60 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 						gint _tmp105_;
 						SANE_Option_Descriptor* _tmp108_;
 						SANE_Value_Type _tmp109_;
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp99_ = _tmp98_;
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp99_) {
+#line 7202 "scanner.c"
 							gint _tmp100_;
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp100_ = i;
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							i = _tmp100_ + 1;
+#line 7208 "scanner.c"
 						}
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp98_ = FALSE;
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp101_ = i;
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp102_ = option;
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp103_ = _tmp102_->constraint.word_list;
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp103__length1 = -1;
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp104_ = _tmp103_[0];
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!(((SANE_Word) _tmp101_) < _tmp104_)) {
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
+#line 7226 "scanner.c"
 						}
+#line 623 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp105_ = i;
+#line 623 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp105_ != 0) {
+#line 7232 "scanner.c"
 							const gchar* _tmp106_;
 							gchar* _tmp107_;
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp106_ = s;
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp107_ = g_strconcat (_tmp106_, ", ", NULL);
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_g_free0 (s);
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							s = _tmp107_;
+#line 7243 "scanner.c"
 						}
+#line 625 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp108_ = option;
+#line 625 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp109_ = _tmp108_->type;
+#line 625 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp109_ == SANE_TYPE_INT) {
+#line 7251 "scanner.c"
 							const gchar* _tmp110_;
 							SANE_Option_Descriptor* _tmp111_;
 							SANE_Word* _tmp112_;
@@ -4939,18 +7263,31 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 							gchar* _tmp115_ = NULL;
 							gchar* _tmp116_;
 							gchar* _tmp117_;
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp110_ = s;
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp111_ = option;
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp112_ = _tmp111_->constraint.word_list;
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp112__length1 = -1;
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp113_ = i;
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp114_ = _tmp112_[_tmp113_ + 1];
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp115_ = g_strdup_printf ("%d", (gint) _tmp114_);
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp116_ = _tmp115_;
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp117_ = g_strconcat (_tmp110_, _tmp116_, NULL);
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_g_free0 (s);
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							s = _tmp117_;
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_g_free0 (_tmp116_);
+#line 7285 "scanner.c"
 						} else {
 							const gchar* _tmp118_;
 							SANE_Option_Descriptor* _tmp119_;
@@ -4962,46 +7299,78 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 							gchar* _tmp124_ = NULL;
 							gchar* _tmp125_;
 							gchar* _tmp126_;
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp118_ = s;
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp119_ = option;
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp120_ = _tmp119_->constraint.word_list;
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp120__length1 = -1;
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp121_ = i;
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp122_ = _tmp120_[_tmp121_ + 1];
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp123_ = SANE_UNFIX ((SANE_Fixed) _tmp122_);
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp124_ = g_strdup_printf ("%f", _tmp123_);
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp125_ = _tmp124_;
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp126_ = g_strconcat (_tmp118_, _tmp125_, NULL);
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_g_free0 (s);
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							s = _tmp126_;
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_g_free0 (_tmp125_);
+#line 7323 "scanner.c"
 						}
 					}
 				}
 			}
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp127_ = s;
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp128_ = g_strconcat (_tmp127_, "]", NULL);
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp128_;
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
+#line 7338 "scanner.c"
 		}
+#line 611 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_CONSTRAINT_STRING_LIST:
+#line 7342 "scanner.c"
 		{
 			const gchar* _tmp129_;
 			gchar* _tmp130_;
 			const gchar* _tmp149_;
 			gchar* _tmp150_;
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp129_ = s;
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp130_ = g_strconcat (_tmp129_, " values=[", NULL);
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp130_;
+#line 7356 "scanner.c"
 			{
 				gint i;
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
+#line 7361 "scanner.c"
 				{
 					gboolean _tmp131_;
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp131_ = TRUE;
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
+#line 7368 "scanner.c"
 						gboolean _tmp132_;
 						SANE_Option_Descriptor* _tmp134_;
 						gchar** _tmp135_;
@@ -5018,61 +7387,111 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 						gchar* _tmp146_ = NULL;
 						gchar* _tmp147_;
 						gchar* _tmp148_;
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp132_ = _tmp131_;
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp132_) {
+#line 7389 "scanner.c"
 							gint _tmp133_;
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp133_ = i;
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							i = _tmp133_ + 1;
+#line 7395 "scanner.c"
 						}
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp131_ = FALSE;
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp134_ = option;
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp135_ = _tmp134_->constraint.string_list;
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp135__length1 = -1;
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp136_ = i;
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp137_ = _tmp135_[_tmp136_];
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!(_tmp137_ != NULL)) {
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
+#line 7413 "scanner.c"
 						}
+#line 636 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp138_ = i;
+#line 636 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp138_ != 0) {
+#line 7419 "scanner.c"
 							const gchar* _tmp139_;
 							gchar* _tmp140_;
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp139_ = s;
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp140_ = g_strconcat (_tmp139_, ", ", NULL);
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_g_free0 (s);
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							s = _tmp140_;
+#line 7430 "scanner.c"
 						}
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp141_ = s;
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp142_ = option;
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp143_ = _tmp142_->constraint.string_list;
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp143__length1 = -1;
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp144_ = i;
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp145_ = _tmp143_[_tmp144_];
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp146_ = g_strdup_printf ("\"%s\"", _tmp145_);
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp147_ = _tmp146_;
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp148_ = g_strconcat (_tmp141_, _tmp147_, NULL);
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_g_free0 (s);
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						s = _tmp148_;
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_g_free0 (_tmp147_);
+#line 7456 "scanner.c"
 					}
 				}
 			}
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp149_ = s;
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp150_ = g_strconcat (_tmp149_, "]", NULL);
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp150_;
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
+#line 7470 "scanner.c"
 		}
 		default:
 		{
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
+#line 7476 "scanner.c"
 		}
 	}
+#line 646 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp151_ = option;
+#line 646 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp152_ = _tmp151_->cap;
+#line 646 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	cap = _tmp152_;
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp153_ = cap;
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp153_ != ((SANE_Int) 0)) {
+#line 7489 "scanner.c"
 		const gchar* _tmp154_;
 		gchar* _tmp155_;
 		SANE_Int _tmp156_;
@@ -5083,203 +7502,365 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 		SANE_Int _tmp191_;
 		SANE_Int _tmp198_;
 		SANE_Int _tmp205_;
+#line 649 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp154_ = s;
+#line 649 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp155_ = g_strconcat (_tmp154_, " cap=", NULL);
+#line 649 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (s);
+#line 649 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		s = _tmp155_;
+#line 650 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp156_ = cap;
+#line 650 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp156_ & SANE_CAP_SOFT_SELECT) != ((SANE_Int) 0)) {
+#line 7512 "scanner.c"
 			const gchar* _tmp157_;
 			const gchar* _tmp160_;
 			gchar* _tmp161_;
 			SANE_Int _tmp162_;
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp157_ = s;
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp157_, "") != 0) {
+#line 7521 "scanner.c"
 				const gchar* _tmp158_;
 				gchar* _tmp159_;
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp158_ = s;
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp159_ = g_strconcat (_tmp158_, ",", NULL);
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp159_;
+#line 7532 "scanner.c"
 			}
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp160_ = s;
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp161_ = g_strconcat (_tmp160_, "soft-select", NULL);
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp161_;
+#line 655 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp162_ = cap;
+#line 655 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp162_ & (~SANE_CAP_SOFT_SELECT);
+#line 7546 "scanner.c"
 		}
+#line 657 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp163_ = cap;
+#line 657 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp163_ & SANE_CAP_HARD_SELECT) != ((SANE_Int) 0)) {
+#line 7552 "scanner.c"
 			const gchar* _tmp164_;
 			const gchar* _tmp167_;
 			gchar* _tmp168_;
 			SANE_Int _tmp169_;
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp164_ = s;
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp164_, "") != 0) {
+#line 7561 "scanner.c"
 				const gchar* _tmp165_;
 				gchar* _tmp166_;
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp165_ = s;
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp166_ = g_strconcat (_tmp165_, ",", NULL);
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp166_;
+#line 7572 "scanner.c"
 			}
+#line 661 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp167_ = s;
+#line 661 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp168_ = g_strconcat (_tmp167_, "hard-select", NULL);
+#line 661 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
+#line 661 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp168_;
+#line 662 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp169_ = cap;
+#line 662 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp169_ & (~SANE_CAP_HARD_SELECT);
+#line 7586 "scanner.c"
 		}
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp170_ = cap;
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp170_ & SANE_CAP_SOFT_DETECT) != ((SANE_Int) 0)) {
+#line 7592 "scanner.c"
 			const gchar* _tmp171_;
 			const gchar* _tmp174_;
 			gchar* _tmp175_;
 			SANE_Int _tmp176_;
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp171_ = s;
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp171_, "") != 0) {
+#line 7601 "scanner.c"
 				const gchar* _tmp172_;
 				gchar* _tmp173_;
+#line 667 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp172_ = s;
+#line 667 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp173_ = g_strconcat (_tmp172_, ",", NULL);
+#line 667 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
+#line 667 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp173_;
+#line 7612 "scanner.c"
 			}
+#line 668 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp174_ = s;
+#line 668 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp175_ = g_strconcat (_tmp174_, "soft-detect", NULL);
+#line 668 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
+#line 668 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp175_;
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp176_ = cap;
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp176_ & (~SANE_CAP_SOFT_DETECT);
+#line 7626 "scanner.c"
 		}
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp177_ = cap;
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp177_ & SANE_CAP_EMULATED) != ((SANE_Int) 0)) {
+#line 7632 "scanner.c"
 			const gchar* _tmp178_;
 			const gchar* _tmp181_;
 			gchar* _tmp182_;
 			SANE_Int _tmp183_;
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp178_ = s;
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp178_, "") != 0) {
+#line 7641 "scanner.c"
 				const gchar* _tmp179_;
 				gchar* _tmp180_;
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp179_ = s;
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp180_ = g_strconcat (_tmp179_, ",", NULL);
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp180_;
+#line 7652 "scanner.c"
 			}
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp181_ = s;
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp182_ = g_strconcat (_tmp181_, "emulated", NULL);
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp182_;
+#line 676 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp183_ = cap;
+#line 676 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp183_ & (~SANE_CAP_EMULATED);
+#line 7666 "scanner.c"
 		}
+#line 678 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp184_ = cap;
+#line 678 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp184_ & SANE_CAP_AUTOMATIC) != ((SANE_Int) 0)) {
+#line 7672 "scanner.c"
 			const gchar* _tmp185_;
 			const gchar* _tmp188_;
 			gchar* _tmp189_;
 			SANE_Int _tmp190_;
+#line 680 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp185_ = s;
+#line 680 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp185_, "") != 0) {
+#line 7681 "scanner.c"
 				const gchar* _tmp186_;
 				gchar* _tmp187_;
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp186_ = s;
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp187_ = g_strconcat (_tmp186_, ",", NULL);
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp187_;
+#line 7692 "scanner.c"
 			}
+#line 682 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp188_ = s;
+#line 682 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp189_ = g_strconcat (_tmp188_, "automatic", NULL);
+#line 682 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
+#line 682 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp189_;
+#line 683 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp190_ = cap;
+#line 683 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp190_ & (~SANE_CAP_AUTOMATIC);
+#line 7706 "scanner.c"
 		}
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp191_ = cap;
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp191_ & SANE_CAP_INACTIVE) != ((SANE_Int) 0)) {
+#line 7712 "scanner.c"
 			const gchar* _tmp192_;
 			const gchar* _tmp195_;
 			gchar* _tmp196_;
 			SANE_Int _tmp197_;
+#line 687 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp192_ = s;
+#line 687 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp192_, "") != 0) {
+#line 7721 "scanner.c"
 				const gchar* _tmp193_;
 				gchar* _tmp194_;
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp193_ = s;
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp194_ = g_strconcat (_tmp193_, ",", NULL);
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp194_;
+#line 7732 "scanner.c"
 			}
+#line 689 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp195_ = s;
+#line 689 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp196_ = g_strconcat (_tmp195_, "inactive", NULL);
+#line 689 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
+#line 689 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp196_;
+#line 690 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp197_ = cap;
+#line 690 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp197_ & (~SANE_CAP_INACTIVE);
+#line 7746 "scanner.c"
 		}
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp198_ = cap;
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp198_ & SANE_CAP_ADVANCED) != ((SANE_Int) 0)) {
+#line 7752 "scanner.c"
 			const gchar* _tmp199_;
 			const gchar* _tmp202_;
 			gchar* _tmp203_;
 			SANE_Int _tmp204_;
+#line 694 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp199_ = s;
+#line 694 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp199_, "") != 0) {
+#line 7761 "scanner.c"
 				const gchar* _tmp200_;
 				gchar* _tmp201_;
+#line 695 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp200_ = s;
+#line 695 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp201_ = g_strconcat (_tmp200_, ",", NULL);
+#line 695 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
+#line 695 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp201_;
+#line 7772 "scanner.c"
 			}
+#line 696 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp202_ = s;
+#line 696 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp203_ = g_strconcat (_tmp202_, "advanced", NULL);
+#line 696 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
+#line 696 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp203_;
+#line 697 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp204_ = cap;
+#line 697 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp204_ & (~SANE_CAP_ADVANCED);
+#line 7786 "scanner.c"
 		}
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp205_ = cap;
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp205_ != ((SANE_Int) 0)) {
+#line 7792 "scanner.c"
 			const gchar* _tmp206_;
 			const gchar* _tmp209_;
 			SANE_Int _tmp210_;
 			gchar* _tmp211_ = NULL;
 			gchar* _tmp212_;
 			gchar* _tmp213_;
+#line 702 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp206_ = s;
+#line 702 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp206_, "") != 0) {
+#line 7803 "scanner.c"
 				const gchar* _tmp207_;
 				gchar* _tmp208_;
+#line 703 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp207_ = s;
+#line 703 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp208_ = g_strconcat (_tmp207_, ",", NULL);
+#line 703 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
+#line 703 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp208_;
+#line 7814 "scanner.c"
 			}
+#line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp209_ = s;
+#line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp210_ = cap;
+#line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp211_ = g_strdup_printf ("%x", (guint) ((gint) _tmp210_));
+#line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp212_ = _tmp211_;
+#line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp213_ = g_strconcat (_tmp209_, _tmp212_, NULL);
+#line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
+#line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp213_;
+#line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (_tmp212_);
+#line 7832 "scanner.c"
 		}
 	}
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp214_ = s;
-	g_debug ("scanner.vala:685: %s", _tmp214_);
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:708: %s", _tmp214_);
+#line 710 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp215_ = option;
+#line 710 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp216_ = _tmp215_->desc;
+#line 710 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp216_ != NULL) {
+#line 7845 "scanner.c"
 		SANE_Option_Descriptor* _tmp217_;
 		const gchar* _tmp218_;
+#line 711 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp217_ = option;
+#line 711 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp218_ = _tmp217_->desc;
-		g_debug ("scanner.vala:688:   Description: %s", _tmp218_);
+#line 711 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_debug ("scanner.vala:711:   Description: %s", _tmp218_);
+#line 7854 "scanner.c"
 	}
+#line 547 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (s);
+#line 7858 "scanner.c"
 }
 
 
@@ -5292,24 +7873,41 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 	GAsyncQueue* _tmp5_;
 	gpointer _tmp6_ = NULL;
 	Credentials* credentials;
+#line 714 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (resource != NULL);
+#line 716 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = scanner_scanner_object;
+#line 716 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = resource;
+#line 716 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = notify_request_authorization_new (_tmp1_);
+#line 716 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _tmp2_;
+#line 716 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_notify (_tmp0_, (Notify*) _tmp3_);
+#line 716 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_notify_unref0 (_tmp3_);
+#line 718 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = scanner_scanner_object;
+#line 718 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = _tmp4_->priv->authorize_queue;
+#line 718 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = g_async_queue_pop (_tmp5_);
+#line 718 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	credentials = (Credentials*) _tmp6_;
+#line 7893 "scanner.c"
 	{
 		gint i;
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		i = 0;
+#line 7898 "scanner.c"
 		{
 			gboolean _tmp7_;
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp7_ = TRUE;
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			while (TRUE) {
+#line 7905 "scanner.c"
 				gboolean _tmp8_;
 				gboolean _tmp10_ = FALSE;
 				Credentials* _tmp11_;
@@ -5325,49 +7923,87 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 				gint _tmp22_;
 				gchar _tmp23_ = '\0';
 				gchar _tmp24_;
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp8_ = _tmp7_;
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp8_) {
+#line 7925 "scanner.c"
 					gint _tmp9_;
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp9_ = i;
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					i = _tmp9_ + 1;
+#line 7931 "scanner.c"
 				}
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp7_ = FALSE;
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp11_ = credentials;
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp12_ = _tmp11_->username;
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp13_ = i;
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp14_ = string_get (_tmp12_, (glong) _tmp13_);
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (_tmp14_ != '\0') {
+#line 7945 "scanner.c"
 					gint _tmp15_;
 					gint _tmp16_;
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp15_ = i;
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp16_ = SANE_MAX_USERNAME_LEN;
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp10_ = _tmp15_ < _tmp16_;
+#line 7954 "scanner.c"
 				} else {
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp10_ = FALSE;
+#line 7958 "scanner.c"
 				}
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp17_ = _tmp10_;
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp17_) {
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
+#line 7966 "scanner.c"
 				}
+#line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp18_ = username;
+#line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp18__length1 = username_length1;
+#line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp19_ = i;
+#line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp20_ = credentials;
+#line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp21_ = _tmp20_->username;
+#line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp22_ = i;
+#line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp23_ = string_get (_tmp21_, (glong) _tmp22_);
+#line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp18_[_tmp19_] = _tmp23_;
+#line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp24_ = _tmp18_[_tmp19_];
+#line 7986 "scanner.c"
 			}
 		}
 	}
 	{
 		gint i;
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		i = 0;
+#line 7994 "scanner.c"
 		{
 			gboolean _tmp25_;
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp25_ = TRUE;
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			while (TRUE) {
+#line 8001 "scanner.c"
 				gboolean _tmp26_;
 				gboolean _tmp28_ = FALSE;
 				Credentials* _tmp29_;
@@ -5383,48 +8019,85 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 				gint _tmp40_;
 				gchar _tmp41_ = '\0';
 				gchar _tmp42_;
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp26_ = _tmp25_;
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp26_) {
+#line 8021 "scanner.c"
 					gint _tmp27_;
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp27_ = i;
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					i = _tmp27_ + 1;
+#line 8027 "scanner.c"
 				}
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp25_ = FALSE;
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp29_ = credentials;
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp30_ = _tmp29_->password;
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp31_ = i;
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp32_ = string_get (_tmp30_, (glong) _tmp31_);
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (_tmp32_ != '\0') {
+#line 8041 "scanner.c"
 					gint _tmp33_;
 					gint _tmp34_;
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp33_ = i;
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp34_ = SANE_MAX_USERNAME_LEN;
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp28_ = _tmp33_ < _tmp34_;
+#line 8050 "scanner.c"
 				} else {
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp28_ = FALSE;
+#line 8054 "scanner.c"
 				}
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp35_ = _tmp28_;
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp35_) {
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
+#line 8062 "scanner.c"
 				}
+#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp36_ = password;
+#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp36__length1 = password_length1;
+#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp37_ = i;
+#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp38_ = credentials;
+#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp39_ = _tmp38_->password;
+#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp40_ = i;
+#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp41_ = string_get (_tmp39_, (glong) _tmp40_);
+#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp36_[_tmp37_] = _tmp41_;
+#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp42_ = _tmp36_[_tmp37_];
+#line 8082 "scanner.c"
 			}
 		}
 	}
+#line 714 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_credentials_unref0 (credentials);
+#line 8088 "scanner.c"
 }
 
 
 static gpointer _credentials_ref0 (gpointer self) {
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? credentials_ref (self) : NULL;
+#line 8095 "scanner.c"
 }
 
 
@@ -5437,50 +8110,90 @@ void scanner_authorize (Scanner* self, const gchar* username, const gchar* passw
 	gchar* _tmp4_;
 	GAsyncQueue* _tmp5_;
 	Credentials* _tmp6_;
+#line 725 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
+#line 725 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (username != NULL);
+#line 725 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (password != NULL);
+#line 727 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = credentials_new ();
+#line 727 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	credentials = _tmp0_;
+#line 728 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = username;
+#line 728 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = g_strdup (_tmp1_);
+#line 728 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (credentials->username);
+#line 728 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	credentials->username = _tmp2_;
+#line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = password;
+#line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = g_strdup (_tmp3_);
+#line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (credentials->password);
+#line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	credentials->password = _tmp4_;
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = self->priv->authorize_queue;
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = _credentials_ref0 (credentials);
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_async_queue_push (_tmp5_, _tmp6_);
+#line 725 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_credentials_unref0 (credentials);
+#line 8142 "scanner.c"
 }
 
 
 static void scanner_close_device (Scanner* self) {
 	gboolean _tmp0_;
+#line 733 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
+#line 735 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->have_handle;
+#line 735 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_) {
+#line 8154 "scanner.c"
 		SANE_Handle _tmp1_;
 		SANE_Handle _tmp2_;
+#line 737 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp1_ = self->priv->handle;
+#line 737 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		sane_cancel (_tmp1_);
-		g_debug ("scanner.vala:715: sane_cancel ()");
+#line 738 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_debug ("scanner.vala:738: sane_cancel ()");
+#line 740 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp2_ = self->priv->handle;
+#line 740 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		sane_close (_tmp2_);
-		g_debug ("scanner.vala:718: sane_close ()");
+#line 741 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_debug ("scanner.vala:741: sane_close ()");
+#line 742 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->have_handle = FALSE;
+#line 743 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_hash_table_unref0 (self->priv->options);
+#line 743 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->options = NULL;
+#line 8175 "scanner.c"
 	}
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer = (g_free (self->priv->buffer), NULL);
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer = NULL;
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer_length1 = 0;
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->_buffer_size_ = self->priv->buffer_length1;
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	__g_list_free__scan_job_unref0_0 (self->priv->job_queue);
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->job_queue = NULL;
+#line 749 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_set_scanning (self, FALSE);
+#line 8191 "scanner.c"
 }
 
 
@@ -5489,26 +8202,41 @@ static void scanner_fail_scan (Scanner* self, gint error_code, const gchar* erro
 	const gchar* _tmp1_;
 	NotifyScanFailed* _tmp2_;
 	NotifyScanFailed* _tmp3_;
+#line 752 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
+#line 752 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (error_string != NULL);
+#line 754 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_close_device (self);
+#line 755 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->state = SCAN_STATE_IDLE;
+#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = error_code;
+#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = error_string;
+#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = notify_scan_failed_new (_tmp0_, _tmp1_);
+#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _tmp2_;
+#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_notify (self, (Notify*) _tmp3_);
+#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_notify_unref0 (_tmp3_);
+#line 8220 "scanner.c"
 }
 
 
 static gpointer _request_ref0 (gpointer self) {
+#line 781 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? request_ref (self) : NULL;
+#line 8227 "scanner.c"
 }
 
 
 static gpointer _scan_job_ref0 (gpointer self) {
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? scan_job_ref (self) : NULL;
+#line 8234 "scanner.c"
 }
 
 
@@ -5518,21 +8246,37 @@ static gboolean scanner_handle_requests (Scanner* self) {
 	ScanState _tmp1_;
 	gboolean _tmp3_;
 	gint request_count;
+#line 759 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
+#line 762 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = self->priv->state;
+#line 762 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ == SCAN_STATE_IDLE) {
+#line 8250 "scanner.c"
 		gboolean _tmp2_;
+#line 762 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp2_ = self->priv->need_redetect;
+#line 762 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp2_;
+#line 8256 "scanner.c"
 	} else {
+#line 762 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = FALSE;
+#line 8260 "scanner.c"
 	}
+#line 762 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _tmp0_;
+#line 762 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp3_) {
+#line 763 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_REDETECT;
+#line 8268 "scanner.c"
 	}
+#line 766 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request_count = 0;
+#line 767 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	while (TRUE) {
+#line 8274 "scanner.c"
 		Request* request = NULL;
 		gboolean _tmp4_ = FALSE;
 		gboolean _tmp5_ = FALSE;
@@ -5541,79 +8285,137 @@ static gboolean scanner_handle_requests (Scanner* self) {
 		gboolean _tmp11_;
 		gint _tmp14_;
 		Request* _tmp15_;
+#line 770 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = self->priv->state;
+#line 770 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp6_ == SCAN_STATE_IDLE) {
+#line 8287 "scanner.c"
 			gint _tmp7_;
+#line 770 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp7_ = request_count;
+#line 770 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp5_ = _tmp7_ == 0;
+#line 8293 "scanner.c"
 		} else {
+#line 770 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp5_ = FALSE;
+#line 8297 "scanner.c"
 		}
+#line 770 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = _tmp5_;
+#line 770 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp8_) {
+#line 770 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = TRUE;
+#line 8305 "scanner.c"
 		} else {
 			GAsyncQueue* _tmp9_;
 			gint _tmp10_ = 0;
+#line 771 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp9_ = self->priv->request_queue;
+#line 771 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp10_ = g_async_queue_length (_tmp9_);
+#line 771 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = _tmp10_ > 0;
+#line 8315 "scanner.c"
 		}
+#line 770 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp11_ = _tmp4_;
+#line 770 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp11_) {
+#line 8321 "scanner.c"
 			GAsyncQueue* _tmp12_;
 			gpointer _tmp13_ = NULL;
+#line 772 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp12_ = self->priv->request_queue;
+#line 772 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp13_ = g_async_queue_pop (_tmp12_);
+#line 772 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_request_unref0 (request);
+#line 772 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			request = (Request*) _tmp13_;
+#line 8332 "scanner.c"
 		} else {
+#line 774 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = TRUE;
+#line 774 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_request_unref0 (request);
+#line 774 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
+#line 8340 "scanner.c"
 		}
-		g_debug ("scanner.vala:753: Processing request");
+#line 776 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_debug ("scanner.vala:776: Processing request");
+#line 777 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = request_count;
+#line 777 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		request_count = _tmp14_ + 1;
+#line 779 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp15_ = request;
+#line 779 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, TYPE_REQUEST_START_SCAN)) {
+#line 8352 "scanner.c"
 			Request* _tmp16_;
 			RequestStartScan* _tmp17_;
 			RequestStartScan* r;
 			RequestStartScan* _tmp18_;
 			ScanJob* _tmp19_;
 			ScanJob* _tmp20_;
+#line 781 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp16_ = request;
+#line 781 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp17_ = _request_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_REQUEST_START_SCAN, RequestStartScan));
+#line 781 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			r = _tmp17_;
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp18_ = r;
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp19_ = _tmp18_->job;
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp20_ = _scan_job_ref0 (_tmp19_);
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			self->priv->job_queue = g_list_append (self->priv->job_queue, _tmp20_);
+#line 779 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_request_unref0 (r);
+#line 8375 "scanner.c"
 		} else {
 			Request* _tmp21_;
+#line 784 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp21_ = request;
+#line 784 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, TYPE_REQUEST_CANCEL)) {
+#line 786 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_fail_scan (self, (gint) SANE_STATUS_CANCELLED, "Scan cancelled - do not report this error");
+#line 8384 "scanner.c"
 			} else {
 				Request* _tmp22_;
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp22_ = request;
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, TYPE_REQUEST_QUIT)) {
+#line 790 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					scanner_close_device (self);
+#line 791 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					result = FALSE;
+#line 791 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_request_unref0 (request);
+#line 791 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					return result;
+#line 8399 "scanner.c"
 				}
 			}
 		}
+#line 767 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_request_unref0 (request);
+#line 8405 "scanner.c"
 	}
 }
 
 
 static void _g_free0_ (gpointer var) {
+#line 835 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	var = (g_free (var), NULL);
+#line 8413 "scanner.c"
 }
 
 
@@ -5646,108 +8448,203 @@ static void scanner_do_open (Scanner* self) {
 	ScanJob* _tmp36_;
 	const gchar* _tmp37_;
 	gchar* _tmp38_;
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->job_queue;
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->data;
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _scan_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST ((ScanJob*) _tmp1_, TYPE_SCAN_JOB, ScanJob));
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	job = _tmp2_;
+#line 800 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->line_count = 0;
+#line 801 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->pass_number = 0;
+#line 802 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->page_number = 0;
+#line 803 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->notified_page = -1;
+#line 804 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->option_index = (SANE_Int) 0;
+#line 806 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = job;
+#line 806 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = _tmp4_->device;
+#line 806 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp5_ == NULL) {
+#line 8472 "scanner.c"
 		const gchar* _tmp6_;
+#line 806 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = self->priv->default_device;
+#line 806 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = _tmp6_ != NULL;
+#line 8478 "scanner.c"
 	} else {
+#line 806 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = FALSE;
+#line 8482 "scanner.c"
 	}
+#line 806 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = _tmp3_;
+#line 806 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp7_) {
+#line 8488 "scanner.c"
 		ScanJob* _tmp8_;
 		const gchar* _tmp9_;
 		gchar* _tmp10_;
+#line 807 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = job;
+#line 807 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = self->priv->default_device;
+#line 807 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp10_ = g_strdup (_tmp9_);
+#line 807 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (_tmp8_->device);
+#line 807 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_->device = _tmp10_;
+#line 8502 "scanner.c"
 	}
+#line 809 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = job;
+#line 809 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp12_ = _tmp11_->device;
+#line 809 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp12_ == NULL) {
+#line 8510 "scanner.c"
 		const gchar* _tmp13_ = NULL;
-		g_warning ("scanner.vala:788: No scan device available");
+#line 811 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_warning ("scanner.vala:811: No scan device available");
+#line 812 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp13_ = _ ("No scanners available.  Please connect a scanner.");
+#line 812 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_fail_scan (self, 0, _tmp13_);
+#line 815 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
+#line 815 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
+#line 8522 "scanner.c"
 	}
+#line 819 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp14_ = self->priv->have_handle;
+#line 819 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp14_) {
+#line 8528 "scanner.c"
 		const gchar* _tmp15_;
 		ScanJob* _tmp16_;
 		const gchar* _tmp17_;
 		SANE_Handle _tmp18_;
+#line 821 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp15_ = self->priv->current_device;
+#line 821 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp16_ = job;
+#line 821 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp17_ = _tmp16_->device;
+#line 821 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (g_strcmp0 (_tmp15_, _tmp17_) == 0) {
+#line 823 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			self->priv->state = SCAN_STATE_GET_OPTION;
+#line 824 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_scan_job_unref0 (job);
+#line 824 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return;
+#line 8547 "scanner.c"
 		}
+#line 827 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp18_ = self->priv->handle;
+#line 827 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		sane_close (_tmp18_);
-		g_debug ("scanner.vala:805: sane_close ()");
+#line 828 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_debug ("scanner.vala:828: sane_close ()");
+#line 829 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->have_handle = FALSE;
+#line 8557 "scanner.c"
 	}
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->priv->current_device);
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->current_device = NULL;
+#line 834 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->have_handle = FALSE;
+#line 835 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp19_ = g_str_hash;
+#line 835 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp20_ = g_str_equal;
+#line 835 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp21_ = g_hash_table_new_full (_tmp19_, _tmp20_, _g_free0_, NULL);
+#line 835 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_hash_table_unref0 (self->priv->options);
+#line 835 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->options = _tmp21_;
+#line 836 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp22_ = job;
+#line 836 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp23_ = _tmp22_->device;
+#line 836 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp25_ = sane_open (_tmp23_, &_tmp24_);
+#line 836 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->handle = _tmp24_;
+#line 836 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp25_;
+#line 837 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp26_ = job;
+#line 837 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp27_ = _tmp26_->device;
+#line 837 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp28_ = status;
+#line 837 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp29_ = sane_status_to_string (_tmp28_);
+#line 837 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp30_ = _tmp29_;
-	g_debug ("scanner.vala:814: sane_open (\"%s\") -> %s", _tmp27_, _tmp30_);
+#line 837 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:837: sane_open (\"%s\") -> %s", _tmp27_, _tmp30_);
+#line 837 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp30_);
+#line 839 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp31_ = status;
+#line 839 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp31_ != SANE_STATUS_GOOD) {
+#line 8603 "scanner.c"
 		SANE_Status _tmp32_;
 		const gchar* _tmp33_ = NULL;
 		SANE_Status _tmp34_;
 		const gchar* _tmp35_ = NULL;
+#line 841 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp32_ = status;
+#line 841 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp33_ = sane_strstatus (_tmp32_);
-		g_warning ("scanner.vala:818: Unable to get open device: %s", _tmp33_);
+#line 841 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_warning ("scanner.vala:841: Unable to get open device: %s", _tmp33_);
+#line 842 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp34_ = status;
+#line 842 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp35_ = _ ("Unable to connect to scanner");
+#line 842 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_fail_scan (self, (gint) _tmp34_, _tmp35_);
+#line 845 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
+#line 845 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
+#line 8624 "scanner.c"
 	}
+#line 847 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->have_handle = TRUE;
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp36_ = job;
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp37_ = _tmp36_->device;
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp38_ = g_strdup (_tmp37_);
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->priv->current_device);
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->current_device = _tmp38_;
+#line 850 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->state = SCAN_STATE_GET_OPTION;
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
+#line 8642 "scanner.c"
 }
 
 
@@ -5765,50 +8662,65 @@ static void scanner_do_get_option (Scanner* self) {
 	SANE_Int index;
 	SANE_Int _tmp8_;
 	SANE_Option_Descriptor* _tmp9_;
-	SANE_Int _tmp332_;
-	SANE_Option_Descriptor* _tmp333_;
-	SANE_Option_Descriptor* _tmp334_;
-	SANE_Value_Type _tmp335_;
-	SANE_Option_Descriptor* _tmp336_;
-	SANE_Int _tmp337_;
-	SANE_Option_Descriptor* _tmp338_;
-	const gchar* _tmp339_;
-	GHashTable* _tmp340_;
-	SANE_Option_Descriptor* _tmp341_;
-	const gchar* _tmp342_;
-	gchar* _tmp343_;
-	SANE_Int _tmp344_;
+	SANE_Int _tmp373_;
+	SANE_Option_Descriptor* _tmp374_;
+	SANE_Option_Descriptor* _tmp375_;
+	SANE_Value_Type _tmp376_;
+	SANE_Option_Descriptor* _tmp377_;
+	SANE_Int _tmp378_;
+	SANE_Option_Descriptor* _tmp379_;
+	const gchar* _tmp380_;
+	GHashTable* _tmp381_;
+	SANE_Option_Descriptor* _tmp382_;
+	const gchar* _tmp383_;
+	gchar* _tmp384_;
+	SANE_Int _tmp385_;
+#line 853 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
+#line 855 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->job_queue;
+#line 855 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->data;
+#line 855 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _scan_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST ((ScanJob*) _tmp1_, TYPE_SCAN_JOB, ScanJob));
+#line 855 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	job = _tmp2_;
+#line 857 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = self->priv->handle;
+#line 857 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = self->priv->option_index;
+#line 857 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = sane_get_option_descriptor (_tmp3_, _tmp4_);
+#line 857 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	option = _tmp5_;
+#line 858 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = self->priv->option_index;
-	g_debug ("scanner.vala:835: sane_get_option_descriptor (%d)", (gint) _tmp6_);
+#line 858 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:858: sane_get_option_descriptor (%d)", (gint) _tmp6_);
+#line 859 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = self->priv->option_index;
+#line 859 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	index = _tmp7_;
+#line 860 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = self->priv->option_index;
+#line 860 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->option_index = _tmp8_ + 1;
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp9_ = option;
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp9_ == NULL) {
+#line 8707 "scanner.c"
 		SANE_Handle _tmp10_;
 		const gchar* _tmp11_;
 		gint _tmp12_ = 0;
 		SANE_Option_Descriptor* _tmp13_ = NULL;
 		SANE_Option_Descriptor* _tmp14_;
-		SANE_Handle _tmp86_;
-		const gchar* _tmp87_;
-		gint _tmp88_ = 0;
-		SANE_Option_Descriptor* _tmp89_ = NULL;
-		SANE_Option_Descriptor* _tmp90_;
-		SANE_Handle _tmp142_;
-		gint _tmp143_ = 0;
-		SANE_Option_Descriptor* _tmp144_ = NULL;
-		SANE_Option_Descriptor* _tmp145_;
+		SANE_Option_Descriptor* _tmp18_;
+		SANE_Handle _tmp93_;
+		const gchar* _tmp94_;
+		gint _tmp95_ = 0;
+		SANE_Option_Descriptor* _tmp96_ = NULL;
+		SANE_Option_Descriptor* _tmp97_;
 		SANE_Handle _tmp153_;
 		gint _tmp154_ = 0;
 		SANE_Option_Descriptor* _tmp155_ = NULL;
@@ -5817,315 +8729,527 @@ static void scanner_do_get_option (Scanner* self) {
 		gint _tmp165_ = 0;
 		SANE_Option_Descriptor* _tmp166_ = NULL;
 		SANE_Option_Descriptor* _tmp167_;
-		SANE_Handle _tmp180_;
-		const gchar* _tmp181_;
-		gint _tmp182_ = 0;
-		SANE_Option_Descriptor* _tmp183_ = NULL;
-		SANE_Option_Descriptor* _tmp184_;
-		SANE_Handle _tmp214_;
-		const gchar* _tmp215_;
-		gint _tmp216_ = 0;
-		SANE_Option_Descriptor* _tmp217_ = NULL;
-		SANE_Option_Descriptor* _tmp218_;
-		SANE_Handle _tmp236_;
-		const gchar* _tmp237_;
-		gint _tmp238_ = 0;
-		SANE_Option_Descriptor* _tmp239_ = NULL;
-		SANE_Option_Descriptor* _tmp240_;
-		SANE_Handle _tmp258_;
-		const gchar* _tmp259_;
-		gint _tmp260_ = 0;
-		SANE_Option_Descriptor* _tmp261_ = NULL;
-		SANE_Option_Descriptor* _tmp262_;
-		SANE_Handle _tmp277_;
-		const gchar* _tmp278_;
-		gint _tmp279_ = 0;
-		SANE_Option_Descriptor* _tmp280_ = NULL;
-		SANE_Option_Descriptor* _tmp281_;
-		const gchar* _tmp296_;
+		SANE_Handle _tmp175_;
+		gint _tmp176_ = 0;
+		SANE_Option_Descriptor* _tmp177_ = NULL;
+		SANE_Option_Descriptor* _tmp178_;
+		SANE_Handle _tmp191_;
+		const gchar* _tmp192_;
+		gint _tmp193_ = 0;
+		SANE_Option_Descriptor* _tmp194_ = NULL;
+		SANE_Option_Descriptor* _tmp195_;
+		SANE_Handle _tmp225_;
+		const gchar* _tmp226_;
+		gint _tmp227_ = 0;
+		SANE_Option_Descriptor* _tmp228_ = NULL;
+		SANE_Option_Descriptor* _tmp229_;
+		SANE_Handle _tmp247_;
+		const gchar* _tmp248_;
+		gint _tmp249_ = 0;
+		SANE_Option_Descriptor* _tmp250_ = NULL;
+		SANE_Option_Descriptor* _tmp251_;
+		SANE_Handle _tmp269_;
+		const gchar* _tmp270_;
+		gint _tmp271_ = 0;
+		SANE_Option_Descriptor* _tmp272_ = NULL;
+		SANE_Option_Descriptor* _tmp273_;
+		SANE_Handle _tmp288_;
+		const gchar* _tmp289_;
+		gint _tmp290_ = 0;
+		SANE_Option_Descriptor* _tmp291_ = NULL;
+		SANE_Option_Descriptor* _tmp292_;
+		SANE_Handle _tmp307_;
+		const gchar* _tmp308_;
+		gint _tmp309_ = 0;
+		SANE_Option_Descriptor* _tmp310_ = NULL;
+		SANE_Option_Descriptor* _tmp311_;
+		SANE_Handle _tmp322_;
+		const gchar* _tmp323_;
+		gint _tmp324_ = 0;
+		SANE_Option_Descriptor* _tmp325_ = NULL;
+		SANE_Option_Descriptor* _tmp326_;
+		const gchar* _tmp337_;
+#line 866 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp10_ = self->priv->handle;
+#line 866 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp11_ = SANE_NAME_SCAN_SOURCE;
+#line 866 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp13_ = scanner_get_option_by_name (self, _tmp10_, _tmp11_, &_tmp12_);
+#line 866 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp12_;
+#line 866 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		option = _tmp13_;
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = option;
-		if (_tmp14_ != NULL) {
-			gchar* _tmp15_;
-			const gchar* _tmp16_ = NULL;
-			gchar* _tmp17_;
-			gchar* _tmp18_;
-			const gchar* _tmp19_ = NULL;
-			gchar* _tmp20_;
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		if (_tmp14_ == NULL) {
+#line 8781 "scanner.c"
+			SANE_Handle _tmp15_;
+			gint _tmp16_ = 0;
+			SANE_Option_Descriptor* _tmp17_ = NULL;
+#line 869 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			g_debug ("scanner.vala:869: SCAN_SOURCE not available, trying alternative \"doc-" \
+"source\"");
+#line 870 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp15_ = self->priv->handle;
+#line 870 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp17_ = scanner_get_option_by_name (self, _tmp15_, "doc-source", &_tmp16_);
+#line 870 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			index = (SANE_Int) _tmp16_;
+#line 870 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			option = _tmp17_;
+#line 8795 "scanner.c"
+		}
+#line 872 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp18_ = option;
+#line 872 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		if (_tmp18_ != NULL) {
+#line 8801 "scanner.c"
+			gchar* _tmp19_;
+			const gchar* _tmp20_ = NULL;
 			gchar* _tmp21_;
 			gchar* _tmp22_;
 			const gchar* _tmp23_ = NULL;
 			gchar* _tmp24_;
-			gchar** _tmp25_ = NULL;
-			gchar** flatbed_sources;
-			gint flatbed_sources_length1;
-			gint _flatbed_sources_size_;
+			gchar* _tmp25_;
 			gchar* _tmp26_;
 			const gchar* _tmp27_ = NULL;
 			gchar* _tmp28_;
-			gchar* _tmp29_;
+			gchar** _tmp29_ = NULL;
+			gchar** flatbed_sources;
+			gint flatbed_sources_length1;
+			gint _flatbed_sources_size_;
 			gchar* _tmp30_;
-			gchar* _tmp31_;
-			gchar** _tmp32_ = NULL;
+			const gchar* _tmp31_ = NULL;
+			gchar* _tmp32_;
+			gchar* _tmp33_;
+			gchar* _tmp34_;
+			gchar* _tmp35_;
+			gchar* _tmp36_;
+			gchar** _tmp37_ = NULL;
 			gchar** adf_sources;
 			gint adf_sources_length1;
 			gint _adf_sources_size_;
-			gchar* _tmp33_;
-			const gchar* _tmp34_ = NULL;
-			gchar* _tmp35_;
-			gchar** _tmp36_ = NULL;
+			gchar* _tmp38_;
+			const gchar* _tmp39_ = NULL;
+			gchar* _tmp40_;
+			gchar** _tmp41_ = NULL;
 			gchar** adf_front_sources;
 			gint adf_front_sources_length1;
 			gint _adf_front_sources_size_;
-			gchar* _tmp37_;
-			const gchar* _tmp38_ = NULL;
-			gchar* _tmp39_;
-			gchar** _tmp40_ = NULL;
+			gchar* _tmp42_;
+			const gchar* _tmp43_ = NULL;
+			gchar* _tmp44_;
+			gchar** _tmp45_ = NULL;
 			gchar** adf_back_sources;
 			gint adf_back_sources_length1;
 			gint _adf_back_sources_size_;
-			gchar* _tmp41_;
-			const gchar* _tmp42_ = NULL;
-			gchar* _tmp43_;
-			gchar** _tmp44_ = NULL;
+			gchar* _tmp46_;
+			const gchar* _tmp47_ = NULL;
+			gchar* _tmp48_;
+			gchar* _tmp49_;
+			gchar* _tmp50_;
+			gchar** _tmp51_ = NULL;
 			gchar** adf_duplex_sources;
 			gint adf_duplex_sources_length1;
 			gint _adf_duplex_sources_size_;
-			ScanJob* _tmp45_;
-			ScanType _tmp46_;
-			_tmp15_ = g_strdup ("Auto");
-			_tmp16_ = SANE_I18N ("Auto");
-			_tmp17_ = g_strdup (_tmp16_);
-			_tmp18_ = g_strdup ("Flatbed");
-			_tmp19_ = SANE_I18N ("Flatbed");
-			_tmp20_ = g_strdup (_tmp19_);
-			_tmp21_ = g_strdup ("FlatBed");
-			_tmp22_ = g_strdup ("Normal");
-			_tmp23_ = SANE_I18N ("Normal");
+			ScanJob* _tmp52_;
+			ScanType _tmp53_;
+#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp19_ = g_strdup ("Auto");
+#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp20_ = SANE_I18N ("Auto");
+#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp21_ = g_strdup (_tmp20_);
+#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp22_ = g_strdup ("Flatbed");
+#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp23_ = SANE_I18N ("Flatbed");
+#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp24_ = g_strdup (_tmp23_);
-			_tmp25_ = g_new0 (gchar*, 7 + 1);
-			_tmp25_[0] = _tmp15_;
-			_tmp25_[1] = _tmp17_;
-			_tmp25_[2] = _tmp18_;
-			_tmp25_[3] = _tmp20_;
-			_tmp25_[4] = _tmp21_;
-			_tmp25_[5] = _tmp22_;
-			_tmp25_[6] = _tmp24_;
-			flatbed_sources = _tmp25_;
+#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp25_ = g_strdup ("FlatBed");
+#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp26_ = g_strdup ("Normal");
+#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp27_ = SANE_I18N ("Normal");
+#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp28_ = g_strdup (_tmp27_);
+#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp29_ = g_new0 (gchar*, 7 + 1);
+#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp29_[0] = _tmp19_;
+#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp29_[1] = _tmp21_;
+#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp29_[2] = _tmp22_;
+#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp29_[3] = _tmp24_;
+#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp29_[4] = _tmp25_;
+#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp29_[5] = _tmp26_;
+#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp29_[6] = _tmp28_;
+#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			flatbed_sources = _tmp29_;
+#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			flatbed_sources_length1 = 7;
+#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_flatbed_sources_size_ = flatbed_sources_length1;
-			_tmp26_ = g_strdup ("Automatic Document Feeder");
-			_tmp27_ = SANE_I18N ("Automatic Document Feeder");
-			_tmp28_ = g_strdup (_tmp27_);
-			_tmp29_ = g_strdup ("ADF");
-			_tmp30_ = g_strdup ("Automatic Document Feeder(left aligned)");
-			_tmp31_ = g_strdup ("Automatic Document Feeder(centrally aligned)");
-			_tmp32_ = g_new0 (gchar*, 5 + 1);
-			_tmp32_[0] = _tmp26_;
-			_tmp32_[1] = _tmp28_;
-			_tmp32_[2] = _tmp29_;
-			_tmp32_[3] = _tmp30_;
-			_tmp32_[4] = _tmp31_;
-			adf_sources = _tmp32_;
-			adf_sources_length1 = 5;
+#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp30_ = g_strdup ("Automatic Document Feeder");
+#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp31_ = SANE_I18N ("Automatic Document Feeder");
+#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp32_ = g_strdup (_tmp31_);
+#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp33_ = g_strdup ("ADF");
+#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp34_ = g_strdup ("Automatic Document Feeder(left aligned)");
+#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp35_ = g_strdup ("Automatic Document Feeder(centrally aligned)");
+#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp36_ = g_strdup ("ADF Simplex");
+#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp37_ = g_new0 (gchar*, 6 + 1);
+#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp37_[0] = _tmp30_;
+#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp37_[1] = _tmp32_;
+#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp37_[2] = _tmp33_;
+#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp37_[3] = _tmp34_;
+#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp37_[4] = _tmp35_;
+#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp37_[5] = _tmp36_;
+#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			adf_sources = _tmp37_;
+#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			adf_sources_length1 = 6;
+#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_adf_sources_size_ = adf_sources_length1;
-			_tmp33_ = g_strdup ("ADF Front");
-			_tmp34_ = SANE_I18N ("ADF Front");
-			_tmp35_ = g_strdup (_tmp34_);
-			_tmp36_ = g_new0 (gchar*, 2 + 1);
-			_tmp36_[0] = _tmp33_;
-			_tmp36_[1] = _tmp35_;
-			adf_front_sources = _tmp36_;
+#line 895 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp38_ = g_strdup ("ADF Front");
+#line 895 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp39_ = SANE_I18N ("ADF Front");
+#line 895 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp40_ = g_strdup (_tmp39_);
+#line 895 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp41_ = g_new0 (gchar*, 2 + 1);
+#line 895 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp41_[0] = _tmp38_;
+#line 895 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp41_[1] = _tmp40_;
+#line 895 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			adf_front_sources = _tmp41_;
+#line 895 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_front_sources_length1 = 2;
+#line 895 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_adf_front_sources_size_ = adf_front_sources_length1;
-			_tmp37_ = g_strdup ("ADF Back");
-			_tmp38_ = SANE_I18N ("ADF Back");
-			_tmp39_ = g_strdup (_tmp38_);
-			_tmp40_ = g_new0 (gchar*, 2 + 1);
-			_tmp40_[0] = _tmp37_;
-			_tmp40_[1] = _tmp39_;
-			adf_back_sources = _tmp40_;
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp42_ = g_strdup ("ADF Back");
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp43_ = SANE_I18N ("ADF Back");
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp44_ = g_strdup (_tmp43_);
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp45_ = g_new0 (gchar*, 2 + 1);
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp45_[0] = _tmp42_;
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp45_[1] = _tmp44_;
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			adf_back_sources = _tmp45_;
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_back_sources_length1 = 2;
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_adf_back_sources_size_ = adf_back_sources_length1;
-			_tmp41_ = g_strdup ("ADF Duplex");
-			_tmp42_ = SANE_I18N ("ADF Duplex");
-			_tmp43_ = g_strdup (_tmp42_);
-			_tmp44_ = g_new0 (gchar*, 2 + 1);
-			_tmp44_[0] = _tmp41_;
-			_tmp44_[1] = _tmp43_;
-			adf_duplex_sources = _tmp44_;
-			adf_duplex_sources_length1 = 2;
+#line 907 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp46_ = g_strdup ("ADF Duplex");
+#line 907 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp47_ = SANE_I18N ("ADF Duplex");
+#line 907 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp48_ = g_strdup (_tmp47_);
+#line 907 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp49_ = g_strdup ("ADF Duplex - Long-Edge Binding");
+#line 907 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp50_ = g_strdup ("ADF Duplex - Short-Edge Binding");
+#line 907 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp51_ = g_new0 (gchar*, 4 + 1);
+#line 907 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp51_[0] = _tmp46_;
+#line 907 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp51_[1] = _tmp48_;
+#line 907 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp51_[2] = _tmp49_;
+#line 907 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp51_[3] = _tmp50_;
+#line 907 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			adf_duplex_sources = _tmp51_;
+#line 907 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			adf_duplex_sources_length1 = 4;
+#line 907 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_adf_duplex_sources_size_ = adf_duplex_sources_length1;
-			_tmp45_ = job;
-			_tmp46_ = _tmp45_->type;
-			switch (_tmp46_) {
+#line 915 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp52_ = job;
+#line 915 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp53_ = _tmp52_->type;
+#line 915 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			switch (_tmp53_) {
+#line 915 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_TYPE_SINGLE:
+#line 8998 "scanner.c"
 				{
-					SANE_Handle _tmp47_;
-					SANE_Option_Descriptor* _tmp48_;
-					SANE_Int _tmp49_;
-					gboolean _tmp50_ = FALSE;
-					_tmp47_ = self->priv->handle;
-					_tmp48_ = option;
-					_tmp49_ = index;
-					_tmp50_ = scanner_set_default_option (self, _tmp47_, _tmp48_, _tmp49_);
-					if (!_tmp50_) {
-						SANE_Handle _tmp51_;
-						SANE_Option_Descriptor* _tmp52_;
-						SANE_Int _tmp53_;
-						gchar** _tmp54_;
-						gint _tmp54__length1;
-						gboolean _tmp55_ = FALSE;
-						_tmp51_ = self->priv->handle;
-						_tmp52_ = option;
-						_tmp53_ = index;
-						_tmp54_ = flatbed_sources;
-						_tmp54__length1 = flatbed_sources_length1;
-						_tmp55_ = scanner_set_constrained_string_option (self, _tmp51_, _tmp52_, _tmp53_, _tmp54_, _tmp54__length1, NULL);
-						if (!_tmp55_) {
-							g_warning ("scanner.vala:889: Unable to set single page source, please file a bug");
+					SANE_Handle _tmp54_;
+					SANE_Option_Descriptor* _tmp55_;
+					SANE_Int _tmp56_;
+					gboolean _tmp57_ = FALSE;
+#line 918 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp54_ = self->priv->handle;
+#line 918 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp55_ = option;
+#line 918 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp56_ = index;
+#line 918 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp57_ = scanner_set_default_option (self, _tmp54_, _tmp55_, _tmp56_);
+#line 918 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					if (!_tmp57_) {
+#line 9014 "scanner.c"
+						SANE_Handle _tmp58_;
+						SANE_Option_Descriptor* _tmp59_;
+						SANE_Int _tmp60_;
+						gchar** _tmp61_;
+						gint _tmp61__length1;
+						gboolean _tmp62_ = FALSE;
+#line 919 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+						_tmp58_ = self->priv->handle;
+#line 919 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+						_tmp59_ = option;
+#line 919 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+						_tmp60_ = index;
+#line 919 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+						_tmp61_ = flatbed_sources;
+#line 919 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+						_tmp61__length1 = flatbed_sources_length1;
+#line 919 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+						_tmp62_ = scanner_set_constrained_string_option (self, _tmp58_, _tmp59_, _tmp60_, _tmp61_, _tmp61__length1, NULL);
+#line 919 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+						if (!_tmp62_) {
+#line 920 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+							g_warning ("scanner.vala:920: Unable to set single page source, please file a bug");
+#line 9037 "scanner.c"
 						}
 					}
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
+#line 9042 "scanner.c"
 				}
+#line 915 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_TYPE_ADF_FRONT:
+#line 9046 "scanner.c"
 				{
-					SANE_Handle _tmp56_;
-					SANE_Option_Descriptor* _tmp57_;
-					SANE_Int _tmp58_;
-					gchar** _tmp59_;
-					gint _tmp59__length1;
-					gboolean _tmp60_ = FALSE;
-					_tmp56_ = self->priv->handle;
-					_tmp57_ = option;
-					_tmp58_ = index;
-					_tmp59_ = adf_front_sources;
-					_tmp59__length1 = adf_front_sources_length1;
-					_tmp60_ = scanner_set_constrained_string_option (self, _tmp56_, _tmp57_, _tmp58_, _tmp59_, _tmp59__length1, NULL);
-					if (!_tmp60_) {
-						SANE_Handle _tmp61_;
-						SANE_Option_Descriptor* _tmp62_;
-						SANE_Int _tmp63_;
-						gchar** _tmp64_;
-						gint _tmp64__length1;
-						gboolean _tmp65_ = FALSE;
-						_tmp61_ = self->priv->handle;
-						_tmp62_ = option;
-						_tmp63_ = index;
-						_tmp64_ = adf_sources;
-						_tmp64__length1 = adf_sources_length1;
-						_tmp65_ = scanner_set_constrained_string_option (self, _tmp61_, _tmp62_, _tmp63_, _tmp64_, _tmp64__length1, NULL);
-						if (!_tmp65_) {
-							g_warning ("scanner.vala:894: Unable to set front ADF source, please file a bug");
+					SANE_Handle _tmp63_;
+					SANE_Option_Descriptor* _tmp64_;
+					SANE_Int _tmp65_;
+					gchar** _tmp66_;
+					gint _tmp66__length1;
+					gboolean _tmp67_ = FALSE;
+#line 923 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp63_ = self->priv->handle;
+#line 923 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp64_ = option;
+#line 923 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp65_ = index;
+#line 923 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp66_ = adf_front_sources;
+#line 923 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp66__length1 = adf_front_sources_length1;
+#line 923 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp67_ = scanner_set_constrained_string_option (self, _tmp63_, _tmp64_, _tmp65_, _tmp66_, _tmp66__length1, NULL);
+#line 923 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					if (!_tmp67_) {
+#line 9068 "scanner.c"
+						SANE_Handle _tmp68_;
+						SANE_Option_Descriptor* _tmp69_;
+						SANE_Int _tmp70_;
+						gchar** _tmp71_;
+						gint _tmp71__length1;
+						gboolean _tmp72_ = FALSE;
+#line 924 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+						_tmp68_ = self->priv->handle;
+#line 924 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+						_tmp69_ = option;
+#line 924 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+						_tmp70_ = index;
+#line 924 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+						_tmp71_ = adf_sources;
+#line 924 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+						_tmp71__length1 = adf_sources_length1;
+#line 924 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+						_tmp72_ = scanner_set_constrained_string_option (self, _tmp68_, _tmp69_, _tmp70_, _tmp71_, _tmp71__length1, NULL);
+#line 924 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+						if (!_tmp72_) {
+#line 925 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+							g_warning ("scanner.vala:925: Unable to set front ADF source, please file a bug");
+#line 9091 "scanner.c"
 						}
 					}
+#line 926 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
+#line 9096 "scanner.c"
 				}
+#line 915 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_TYPE_ADF_BACK:
+#line 9100 "scanner.c"
 				{
-					SANE_Handle _tmp66_;
-					SANE_Option_Descriptor* _tmp67_;
-					SANE_Int _tmp68_;
-					gchar** _tmp69_;
-					gint _tmp69__length1;
-					gboolean _tmp70_ = FALSE;
-					_tmp66_ = self->priv->handle;
-					_tmp67_ = option;
-					_tmp68_ = index;
-					_tmp69_ = adf_back_sources;
-					_tmp69__length1 = adf_back_sources_length1;
-					_tmp70_ = scanner_set_constrained_string_option (self, _tmp66_, _tmp67_, _tmp68_, _tmp69_, _tmp69__length1, NULL);
-					if (!_tmp70_) {
-						SANE_Handle _tmp71_;
-						SANE_Option_Descriptor* _tmp72_;
-						SANE_Int _tmp73_;
-						gchar** _tmp74_;
-						gint _tmp74__length1;
-						gboolean _tmp75_ = FALSE;
-						_tmp71_ = self->priv->handle;
-						_tmp72_ = option;
-						_tmp73_ = index;
-						_tmp74_ = adf_sources;
-						_tmp74__length1 = adf_sources_length1;
-						_tmp75_ = scanner_set_constrained_string_option (self, _tmp71_, _tmp72_, _tmp73_, _tmp74_, _tmp74__length1, NULL);
-						if (!_tmp75_) {
-							g_warning ("scanner.vala:899: Unable to set back ADF source, please file a bug");
+					SANE_Handle _tmp73_;
+					SANE_Option_Descriptor* _tmp74_;
+					SANE_Int _tmp75_;
+					gchar** _tmp76_;
+					gint _tmp76__length1;
+					gboolean _tmp77_ = FALSE;
+#line 928 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp73_ = self->priv->handle;
+#line 928 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp74_ = option;
+#line 928 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp75_ = index;
+#line 928 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp76_ = adf_back_sources;
+#line 928 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp76__length1 = adf_back_sources_length1;
+#line 928 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp77_ = scanner_set_constrained_string_option (self, _tmp73_, _tmp74_, _tmp75_, _tmp76_, _tmp76__length1, NULL);
+#line 928 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					if (!_tmp77_) {
+#line 9122 "scanner.c"
+						SANE_Handle _tmp78_;
+						SANE_Option_Descriptor* _tmp79_;
+						SANE_Int _tmp80_;
+						gchar** _tmp81_;
+						gint _tmp81__length1;
+						gboolean _tmp82_ = FALSE;
+#line 929 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+						_tmp78_ = self->priv->handle;
+#line 929 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+						_tmp79_ = option;
+#line 929 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+						_tmp80_ = index;
+#line 929 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+						_tmp81_ = adf_sources;
+#line 929 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+						_tmp81__length1 = adf_sources_length1;
+#line 929 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+						_tmp82_ = scanner_set_constrained_string_option (self, _tmp78_, _tmp79_, _tmp80_, _tmp81_, _tmp81__length1, NULL);
+#line 929 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+						if (!_tmp82_) {
+#line 930 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+							g_warning ("scanner.vala:930: Unable to set back ADF source, please file a bug");
+#line 9145 "scanner.c"
 						}
 					}
+#line 931 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
+#line 9150 "scanner.c"
 				}
+#line 915 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_TYPE_ADF_BOTH:
+#line 9154 "scanner.c"
 				{
-					SANE_Handle _tmp76_;
-					SANE_Option_Descriptor* _tmp77_;
-					SANE_Int _tmp78_;
-					gchar** _tmp79_;
-					gint _tmp79__length1;
-					gboolean _tmp80_ = FALSE;
-					_tmp76_ = self->priv->handle;
-					_tmp77_ = option;
-					_tmp78_ = index;
-					_tmp79_ = adf_duplex_sources;
-					_tmp79__length1 = adf_duplex_sources_length1;
-					_tmp80_ = scanner_set_constrained_string_option (self, _tmp76_, _tmp77_, _tmp78_, _tmp79_, _tmp79__length1, NULL);
-					if (!_tmp80_) {
-						SANE_Handle _tmp81_;
-						SANE_Option_Descriptor* _tmp82_;
-						SANE_Int _tmp83_;
-						gchar** _tmp84_;
-						gint _tmp84__length1;
-						gboolean _tmp85_ = FALSE;
-						_tmp81_ = self->priv->handle;
-						_tmp82_ = option;
-						_tmp83_ = index;
-						_tmp84_ = adf_sources;
-						_tmp84__length1 = adf_sources_length1;
-						_tmp85_ = scanner_set_constrained_string_option (self, _tmp81_, _tmp82_, _tmp83_, _tmp84_, _tmp84__length1, NULL);
-						if (!_tmp85_) {
-							g_warning ("scanner.vala:904: Unable to set duplex ADF source, please file a bug");
+					SANE_Handle _tmp83_;
+					SANE_Option_Descriptor* _tmp84_;
+					SANE_Int _tmp85_;
+					gchar** _tmp86_;
+					gint _tmp86__length1;
+					gboolean _tmp87_ = FALSE;
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp83_ = self->priv->handle;
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp84_ = option;
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp85_ = index;
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp86_ = adf_duplex_sources;
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp86__length1 = adf_duplex_sources_length1;
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp87_ = scanner_set_constrained_string_option (self, _tmp83_, _tmp84_, _tmp85_, _tmp86_, _tmp86__length1, NULL);
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					if (!_tmp87_) {
+#line 9176 "scanner.c"
+						SANE_Handle _tmp88_;
+						SANE_Option_Descriptor* _tmp89_;
+						SANE_Int _tmp90_;
+						gchar** _tmp91_;
+						gint _tmp91__length1;
+						gboolean _tmp92_ = FALSE;
+#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+						_tmp88_ = self->priv->handle;
+#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+						_tmp89_ = option;
+#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+						_tmp90_ = index;
+#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+						_tmp91_ = adf_sources;
+#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+						_tmp91__length1 = adf_sources_length1;
+#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+						_tmp92_ = scanner_set_constrained_string_option (self, _tmp88_, _tmp89_, _tmp90_, _tmp91_, _tmp91__length1, NULL);
+#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+						if (!_tmp92_) {
+#line 935 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+							g_warning ("scanner.vala:935: Unable to set duplex ADF source, please file a bug");
+#line 9199 "scanner.c"
 						}
 					}
+#line 936 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
+#line 9204 "scanner.c"
 				}
 				default:
+#line 915 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
+#line 9209 "scanner.c"
 			}
+#line 872 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_duplex_sources = (_vala_array_free (adf_duplex_sources, adf_duplex_sources_length1, (GDestroyNotify) g_free), NULL);
+#line 872 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_back_sources = (_vala_array_free (adf_back_sources, adf_back_sources_length1, (GDestroyNotify) g_free), NULL);
+#line 872 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_front_sources = (_vala_array_free (adf_front_sources, adf_front_sources_length1, (GDestroyNotify) g_free), NULL);
+#line 872 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_sources = (_vala_array_free (adf_sources, adf_sources_length1, (GDestroyNotify) g_free), NULL);
+#line 872 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			flatbed_sources = (_vala_array_free (flatbed_sources, flatbed_sources_length1, (GDestroyNotify) g_free), NULL);
+#line 9221 "scanner.c"
 		}
-		_tmp86_ = self->priv->handle;
-		_tmp87_ = SANE_NAME_SCAN_MODE;
-		_tmp89_ = scanner_get_option_by_name (self, _tmp86_, _tmp87_, &_tmp88_);
-		index = (SANE_Int) _tmp88_;
-		option = _tmp89_;
-		_tmp90_ = option;
-		if (_tmp90_ != NULL) {
-			const gchar* _tmp91_;
-			gchar* _tmp92_;
-			gchar* _tmp93_;
-			gchar* _tmp94_;
-			gchar** _tmp95_ = NULL;
-			gchar** color_scan_modes;
-			gint color_scan_modes_length1;
-			gint _color_scan_modes_size_;
-			const gchar* _tmp96_;
-			gchar* _tmp97_;
-			gchar* _tmp98_;
+#line 941 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp93_ = self->priv->handle;
+#line 941 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp94_ = SANE_NAME_SCAN_MODE;
+#line 941 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp96_ = scanner_get_option_by_name (self, _tmp93_, _tmp94_, &_tmp95_);
+#line 941 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		index = (SANE_Int) _tmp95_;
+#line 941 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		option = _tmp96_;
+#line 942 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp97_ = option;
+#line 942 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		if (_tmp97_ != NULL) {
+#line 9237 "scanner.c"
+			const gchar* _tmp98_;
 			gchar* _tmp99_;
-			const gchar* _tmp100_ = NULL;
+			gchar* _tmp100_;
 			gchar* _tmp101_;
 			gchar* _tmp102_;
 			gchar** _tmp103_ = NULL;
-			gchar** gray_scan_modes;
-			gint gray_scan_modes_length1;
-			gint _gray_scan_modes_size_;
+			gchar** color_scan_modes;
+			gint color_scan_modes_length1;
+			gint _color_scan_modes_size_;
 			const gchar* _tmp104_;
 			gchar* _tmp105_;
 			gchar* _tmp106_;
@@ -6133,642 +9257,1238 @@ static void scanner_do_get_option (Scanner* self) {
 			const gchar* _tmp108_ = NULL;
 			gchar* _tmp109_;
 			gchar* _tmp110_;
-			const gchar* _tmp111_ = NULL;
-			gchar* _tmp112_;
-			gchar* _tmp113_;
-			const gchar* _tmp114_ = NULL;
+			gchar* _tmp111_;
+			gchar** _tmp112_ = NULL;
+			gchar** gray_scan_modes;
+			gint gray_scan_modes_length1;
+			gint _gray_scan_modes_size_;
+			const gchar* _tmp113_;
+			gchar* _tmp114_;
 			gchar* _tmp115_;
 			gchar* _tmp116_;
-			const gchar* _tmp117_;
+			const gchar* _tmp117_ = NULL;
 			gchar* _tmp118_;
 			gchar* _tmp119_;
-			gchar* _tmp120_;
-			const gchar* _tmp121_ = NULL;
+			const gchar* _tmp120_ = NULL;
+			gchar* _tmp121_;
 			gchar* _tmp122_;
-			gchar* _tmp123_;
-			gchar** _tmp124_ = NULL;
+			const gchar* _tmp123_ = NULL;
+			gchar* _tmp124_;
+			gchar* _tmp125_;
+			const gchar* _tmp126_;
+			gchar* _tmp127_;
+			gchar* _tmp128_;
+			gchar* _tmp129_;
+			const gchar* _tmp130_ = NULL;
+			gchar* _tmp131_;
+			gchar* _tmp132_;
+			gchar* _tmp133_;
+			gchar* _tmp134_;
+			gchar** _tmp135_ = NULL;
 			gchar** lineart_scan_modes;
 			gint lineart_scan_modes_length1;
 			gint _lineart_scan_modes_size_;
-			ScanJob* _tmp125_;
-			ScanMode _tmp126_;
-			_tmp91_ = SANE_VALUE_SCAN_MODE_COLOR;
-			_tmp92_ = g_strdup (_tmp91_);
-			_tmp93_ = g_strdup ("Color");
-			_tmp94_ = g_strdup ("24bit Color");
-			_tmp95_ = g_new0 (gchar*, 3 + 1);
-			_tmp95_[0] = _tmp92_;
-			_tmp95_[1] = _tmp93_;
-			_tmp95_[2] = _tmp94_;
-			color_scan_modes = _tmp95_;
-			color_scan_modes_length1 = 3;
+			ScanJob* _tmp136_;
+			ScanMode _tmp137_;
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp98_ = SANE_VALUE_SCAN_MODE_COLOR;
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp99_ = g_strdup (_tmp98_);
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp100_ = g_strdup ("Color");
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp101_ = g_strdup ("24bit Color");
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp102_ = g_strdup ("Color - 16 Million Colors");
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp103_ = g_new0 (gchar*, 4 + 1);
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp103_[0] = _tmp99_;
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp103_[1] = _tmp100_;
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp103_[2] = _tmp101_;
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp103_[3] = _tmp102_;
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			color_scan_modes = _tmp103_;
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			color_scan_modes_length1 = 4;
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_color_scan_modes_size_ = color_scan_modes_length1;
-			_tmp96_ = SANE_VALUE_SCAN_MODE_GRAY;
-			_tmp97_ = g_strdup (_tmp96_);
-			_tmp98_ = g_strdup ("Gray");
-			_tmp99_ = g_strdup ("Grayscale");
-			_tmp100_ = SANE_I18N ("Grayscale");
-			_tmp101_ = g_strdup (_tmp100_);
-			_tmp102_ = g_strdup ("True Gray");
-			_tmp103_ = g_new0 (gchar*, 5 + 1);
-			_tmp103_[0] = _tmp97_;
-			_tmp103_[1] = _tmp98_;
-			_tmp103_[2] = _tmp99_;
-			_tmp103_[3] = _tmp101_;
-			_tmp103_[4] = _tmp102_;
-			gray_scan_modes = _tmp103_;
-			gray_scan_modes_length1 = 5;
-			_gray_scan_modes_size_ = gray_scan_modes_length1;
-			_tmp104_ = SANE_VALUE_SCAN_MODE_LINEART;
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp104_ = SANE_VALUE_SCAN_MODE_GRAY;
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp105_ = g_strdup (_tmp104_);
-			_tmp106_ = g_strdup ("Lineart");
-			_tmp107_ = g_strdup ("LineArt");
-			_tmp108_ = SANE_I18N ("LineArt");
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp106_ = g_strdup ("Gray");
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp107_ = g_strdup ("Grayscale");
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp108_ = SANE_I18N ("Grayscale");
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp109_ = g_strdup (_tmp108_);
-			_tmp110_ = g_strdup ("Black & White");
-			_tmp111_ = SANE_I18N ("Black & White");
-			_tmp112_ = g_strdup (_tmp111_);
-			_tmp113_ = g_strdup ("Binary");
-			_tmp114_ = SANE_I18N ("Binary");
-			_tmp115_ = g_strdup (_tmp114_);
-			_tmp116_ = g_strdup ("Thresholded");
-			_tmp117_ = SANE_VALUE_SCAN_MODE_GRAY;
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp110_ = g_strdup ("True Gray");
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp111_ = g_strdup ("Grayscale - 256 Levels");
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp112_ = g_new0 (gchar*, 6 + 1);
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp112_[0] = _tmp105_;
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp112_[1] = _tmp106_;
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp112_[2] = _tmp107_;
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp112_[3] = _tmp109_;
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp112_[4] = _tmp110_;
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp112_[5] = _tmp111_;
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			gray_scan_modes = _tmp112_;
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			gray_scan_modes_length1 = 6;
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_gray_scan_modes_size_ = gray_scan_modes_length1;
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp113_ = SANE_VALUE_SCAN_MODE_LINEART;
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp114_ = g_strdup (_tmp113_);
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp115_ = g_strdup ("Lineart");
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp116_ = g_strdup ("LineArt");
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp117_ = SANE_I18N ("LineArt");
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp118_ = g_strdup (_tmp117_);
-			_tmp119_ = g_strdup ("Gray");
-			_tmp120_ = g_strdup ("Grayscale");
-			_tmp121_ = SANE_I18N ("Grayscale");
-			_tmp122_ = g_strdup (_tmp121_);
-			_tmp123_ = g_strdup ("True Gray");
-			_tmp124_ = g_new0 (gchar*, 14 + 1);
-			_tmp124_[0] = _tmp105_;
-			_tmp124_[1] = _tmp106_;
-			_tmp124_[2] = _tmp107_;
-			_tmp124_[3] = _tmp109_;
-			_tmp124_[4] = _tmp110_;
-			_tmp124_[5] = _tmp112_;
-			_tmp124_[6] = _tmp113_;
-			_tmp124_[7] = _tmp115_;
-			_tmp124_[8] = _tmp116_;
-			_tmp124_[9] = _tmp118_;
-			_tmp124_[10] = _tmp119_;
-			_tmp124_[11] = _tmp120_;
-			_tmp124_[12] = _tmp122_;
-			_tmp124_[13] = _tmp123_;
-			lineart_scan_modes = _tmp124_;
-			lineart_scan_modes_length1 = 14;
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp119_ = g_strdup ("Black & White");
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp120_ = SANE_I18N ("Black & White");
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp121_ = g_strdup (_tmp120_);
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp122_ = g_strdup ("Binary");
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp123_ = SANE_I18N ("Binary");
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp124_ = g_strdup (_tmp123_);
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp125_ = g_strdup ("Thresholded");
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp126_ = SANE_VALUE_SCAN_MODE_GRAY;
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp127_ = g_strdup (_tmp126_);
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp128_ = g_strdup ("Gray");
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp129_ = g_strdup ("Grayscale");
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp130_ = SANE_I18N ("Grayscale");
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp131_ = g_strdup (_tmp130_);
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp132_ = g_strdup ("True Gray");
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp133_ = g_strdup ("Black and White - Line Art");
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp134_ = g_strdup ("Black and White - Halftone");
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp135_ = g_new0 (gchar*, 16 + 1);
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp135_[0] = _tmp114_;
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp135_[1] = _tmp115_;
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp135_[2] = _tmp116_;
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp135_[3] = _tmp118_;
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp135_[4] = _tmp119_;
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp135_[5] = _tmp121_;
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp135_[6] = _tmp122_;
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp135_[7] = _tmp124_;
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp135_[8] = _tmp125_;
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp135_[9] = _tmp127_;
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp135_[10] = _tmp128_;
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp135_[11] = _tmp129_;
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp135_[12] = _tmp131_;
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp135_[13] = _tmp132_;
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp135_[14] = _tmp133_;
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp135_[15] = _tmp134_;
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			lineart_scan_modes = _tmp135_;
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			lineart_scan_modes_length1 = 16;
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_lineart_scan_modes_size_ = lineart_scan_modes_length1;
-			_tmp125_ = job;
-			_tmp126_ = _tmp125_->scan_mode;
-			switch (_tmp126_) {
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp136_ = job;
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp137_ = _tmp136_->scan_mode;
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			switch (_tmp137_) {
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_MODE_COLOR:
+#line 9441 "scanner.c"
 				{
-					SANE_Handle _tmp127_;
-					SANE_Option_Descriptor* _tmp128_;
-					SANE_Int _tmp129_;
-					gchar** _tmp130_;
-					gint _tmp130__length1;
-					gboolean _tmp131_ = FALSE;
-					_tmp127_ = self->priv->handle;
-					_tmp128_ = option;
-					_tmp129_ = index;
-					_tmp130_ = color_scan_modes;
-					_tmp130__length1 = color_scan_modes_length1;
-					_tmp131_ = scanner_set_constrained_string_option (self, _tmp127_, _tmp128_, _tmp129_, _tmp130_, _tmp130__length1, NULL);
-					if (!_tmp131_) {
-						g_warning ("scanner.vala:950: Unable to set Color mode, please file a bug");
+					SANE_Handle _tmp138_;
+					SANE_Option_Descriptor* _tmp139_;
+					SANE_Int _tmp140_;
+					gchar** _tmp141_;
+					gint _tmp141__length1;
+					gboolean _tmp142_ = FALSE;
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp138_ = self->priv->handle;
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp139_ = option;
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp140_ = index;
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp141_ = color_scan_modes;
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp141__length1 = color_scan_modes_length1;
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp142_ = scanner_set_constrained_string_option (self, _tmp138_, _tmp139_, _tmp140_, _tmp141_, _tmp141__length1, NULL);
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					if (!_tmp142_) {
+#line 985 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+						g_warning ("scanner.vala:985: Unable to set Color mode, please file a bug");
+#line 9465 "scanner.c"
 					}
+#line 986 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
+#line 9469 "scanner.c"
 				}
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_MODE_GRAY:
+#line 9473 "scanner.c"
 				{
-					SANE_Handle _tmp132_;
-					SANE_Option_Descriptor* _tmp133_;
-					SANE_Int _tmp134_;
-					gchar** _tmp135_;
-					gint _tmp135__length1;
-					gboolean _tmp136_ = FALSE;
-					_tmp132_ = self->priv->handle;
-					_tmp133_ = option;
-					_tmp134_ = index;
-					_tmp135_ = gray_scan_modes;
-					_tmp135__length1 = gray_scan_modes_length1;
-					_tmp136_ = scanner_set_constrained_string_option (self, _tmp132_, _tmp133_, _tmp134_, _tmp135_, _tmp135__length1, NULL);
-					if (!_tmp136_) {
-						g_warning ("scanner.vala:954: Unable to set Gray mode, please file a bug");
+					SANE_Handle _tmp143_;
+					SANE_Option_Descriptor* _tmp144_;
+					SANE_Int _tmp145_;
+					gchar** _tmp146_;
+					gint _tmp146__length1;
+					gboolean _tmp147_ = FALSE;
+#line 988 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp143_ = self->priv->handle;
+#line 988 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp144_ = option;
+#line 988 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp145_ = index;
+#line 988 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp146_ = gray_scan_modes;
+#line 988 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp146__length1 = gray_scan_modes_length1;
+#line 988 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp147_ = scanner_set_constrained_string_option (self, _tmp143_, _tmp144_, _tmp145_, _tmp146_, _tmp146__length1, NULL);
+#line 988 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					if (!_tmp147_) {
+#line 989 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+						g_warning ("scanner.vala:989: Unable to set Gray mode, please file a bug");
+#line 9497 "scanner.c"
 					}
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
+#line 9501 "scanner.c"
 				}
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_MODE_LINEART:
+#line 9505 "scanner.c"
 				{
-					SANE_Handle _tmp137_;
-					SANE_Option_Descriptor* _tmp138_;
-					SANE_Int _tmp139_;
-					gchar** _tmp140_;
-					gint _tmp140__length1;
-					gboolean _tmp141_ = FALSE;
-					_tmp137_ = self->priv->handle;
-					_tmp138_ = option;
-					_tmp139_ = index;
-					_tmp140_ = lineart_scan_modes;
-					_tmp140__length1 = lineart_scan_modes_length1;
-					_tmp141_ = scanner_set_constrained_string_option (self, _tmp137_, _tmp138_, _tmp139_, _tmp140_, _tmp140__length1, NULL);
-					if (!_tmp141_) {
-						g_warning ("scanner.vala:958: Unable to set Lineart mode, please file a bug");
+					SANE_Handle _tmp148_;
+					SANE_Option_Descriptor* _tmp149_;
+					SANE_Int _tmp150_;
+					gchar** _tmp151_;
+					gint _tmp151__length1;
+					gboolean _tmp152_ = FALSE;
+#line 992 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp148_ = self->priv->handle;
+#line 992 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp149_ = option;
+#line 992 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp150_ = index;
+#line 992 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp151_ = lineart_scan_modes;
+#line 992 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp151__length1 = lineart_scan_modes_length1;
+#line 992 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp152_ = scanner_set_constrained_string_option (self, _tmp148_, _tmp149_, _tmp150_, _tmp151_, _tmp151__length1, NULL);
+#line 992 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					if (!_tmp152_) {
+#line 993 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+						g_warning ("scanner.vala:993: Unable to set Lineart mode, please file a bug");
+#line 9529 "scanner.c"
 					}
+#line 994 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
+#line 9533 "scanner.c"
 				}
 				default:
 				{
+#line 996 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
+#line 9539 "scanner.c"
 				}
 			}
+#line 942 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			lineart_scan_modes = (_vala_array_free (lineart_scan_modes, lineart_scan_modes_length1, (GDestroyNotify) g_free), NULL);
+#line 942 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			gray_scan_modes = (_vala_array_free (gray_scan_modes, gray_scan_modes_length1, (GDestroyNotify) g_free), NULL);
+#line 942 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			color_scan_modes = (_vala_array_free (color_scan_modes, color_scan_modes_length1, (GDestroyNotify) g_free), NULL);
+#line 9548 "scanner.c"
 		}
-		_tmp142_ = self->priv->handle;
-		_tmp144_ = scanner_get_option_by_name (self, _tmp142_, "duplex", &_tmp143_);
-		index = (SANE_Int) _tmp143_;
-		option = _tmp144_;
-		_tmp145_ = option;
-		if (_tmp145_ != NULL) {
-			SANE_Option_Descriptor* _tmp146_;
-			SANE_Value_Type _tmp147_;
-			_tmp146_ = option;
-			_tmp147_ = _tmp146_->type;
-			if (_tmp147_ == SANE_TYPE_BOOL) {
-				SANE_Handle _tmp148_;
-				SANE_Option_Descriptor* _tmp149_;
-				SANE_Int _tmp150_;
-				ScanJob* _tmp151_;
-				ScanType _tmp152_;
-				_tmp148_ = self->priv->handle;
-				_tmp149_ = option;
-				_tmp150_ = index;
-				_tmp151_ = job;
-				_tmp152_ = _tmp151_->type;
-				scanner_set_bool_option (self, _tmp148_, _tmp149_, _tmp150_, _tmp152_ == SCAN_TYPE_ADF_BOTH, NULL);
-			}
-		}
+#line 1001 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp153_ = self->priv->handle;
-		_tmp155_ = scanner_get_option_by_name (self, _tmp153_, "batch-scan", &_tmp154_);
+#line 1001 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp155_ = scanner_get_option_by_name (self, _tmp153_, "duplex", &_tmp154_);
+#line 1001 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp154_;
+#line 1001 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		option = _tmp155_;
+#line 1002 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp156_ = option;
+#line 1002 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp156_ != NULL) {
+#line 9562 "scanner.c"
 			SANE_Option_Descriptor* _tmp157_;
 			SANE_Value_Type _tmp158_;
+#line 1004 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp157_ = option;
+#line 1004 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp158_ = _tmp157_->type;
+#line 1004 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp158_ == SANE_TYPE_BOOL) {
+#line 9571 "scanner.c"
 				SANE_Handle _tmp159_;
 				SANE_Option_Descriptor* _tmp160_;
 				SANE_Int _tmp161_;
 				ScanJob* _tmp162_;
 				ScanType _tmp163_;
+#line 1005 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp159_ = self->priv->handle;
+#line 1005 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp160_ = option;
+#line 1005 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp161_ = index;
+#line 1005 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp162_ = job;
+#line 1005 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp163_ = _tmp162_->type;
-				scanner_set_bool_option (self, _tmp159_, _tmp160_, _tmp161_, _tmp163_ != SCAN_TYPE_SINGLE, NULL);
+#line 1005 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				scanner_set_bool_option (self, _tmp159_, _tmp160_, _tmp161_, _tmp163_ == SCAN_TYPE_ADF_BOTH, NULL);
+#line 9589 "scanner.c"
 			}
 		}
+#line 1009 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp164_ = self->priv->handle;
-		_tmp166_ = scanner_get_option_by_name (self, _tmp164_, "compression", &_tmp165_);
+#line 1009 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp166_ = scanner_get_option_by_name (self, _tmp164_, "batch-scan", &_tmp165_);
+#line 1009 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp165_;
+#line 1009 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		option = _tmp166_;
+#line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp167_ = option;
+#line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp167_ != NULL) {
-			const gchar* _tmp168_ = NULL;
-			gchar* _tmp169_;
-			const gchar* _tmp170_ = NULL;
-			gchar* _tmp171_;
-			gchar* _tmp172_;
-			gchar* _tmp173_;
-			gchar** _tmp174_ = NULL;
+#line 9604 "scanner.c"
+			SANE_Option_Descriptor* _tmp168_;
+			SANE_Value_Type _tmp169_;
+#line 1012 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp168_ = option;
+#line 1012 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp169_ = _tmp168_->type;
+#line 1012 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			if (_tmp169_ == SANE_TYPE_BOOL) {
+#line 9613 "scanner.c"
+				SANE_Handle _tmp170_;
+				SANE_Option_Descriptor* _tmp171_;
+				SANE_Int _tmp172_;
+				ScanJob* _tmp173_;
+				ScanType _tmp174_;
+#line 1013 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp170_ = self->priv->handle;
+#line 1013 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp171_ = option;
+#line 1013 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp172_ = index;
+#line 1013 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp173_ = job;
+#line 1013 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp174_ = _tmp173_->type;
+#line 1013 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				scanner_set_bool_option (self, _tmp170_, _tmp171_, _tmp172_, _tmp174_ != SCAN_TYPE_SINGLE, NULL);
+#line 9631 "scanner.c"
+			}
+		}
+#line 1017 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp175_ = self->priv->handle;
+#line 1017 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp177_ = scanner_get_option_by_name (self, _tmp175_, "compression", &_tmp176_);
+#line 1017 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		index = (SANE_Int) _tmp176_;
+#line 1017 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		option = _tmp177_;
+#line 1018 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp178_ = option;
+#line 1018 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		if (_tmp178_ != NULL) {
+#line 9646 "scanner.c"
+			const gchar* _tmp179_ = NULL;
+			gchar* _tmp180_;
+			const gchar* _tmp181_ = NULL;
+			gchar* _tmp182_;
+			gchar* _tmp183_;
+			gchar* _tmp184_;
+			gchar** _tmp185_ = NULL;
 			gchar** disable_compression_names;
 			gint disable_compression_names_length1;
 			gint _disable_compression_names_size_;
-			SANE_Handle _tmp175_;
-			SANE_Option_Descriptor* _tmp176_;
-			SANE_Int _tmp177_;
-			gchar** _tmp178_;
-			gint _tmp178__length1;
-			gboolean _tmp179_ = FALSE;
-			_tmp168_ = SANE_I18N ("None");
-			_tmp169_ = g_strdup (_tmp168_);
-			_tmp170_ = SANE_I18N ("none");
-			_tmp171_ = g_strdup (_tmp170_);
-			_tmp172_ = g_strdup ("None");
-			_tmp173_ = g_strdup ("none");
-			_tmp174_ = g_new0 (gchar*, 4 + 1);
-			_tmp174_[0] = _tmp169_;
-			_tmp174_[1] = _tmp171_;
-			_tmp174_[2] = _tmp172_;
-			_tmp174_[3] = _tmp173_;
-			disable_compression_names = _tmp174_;
+			SANE_Handle _tmp186_;
+			SANE_Option_Descriptor* _tmp187_;
+			SANE_Int _tmp188_;
+			gchar** _tmp189_;
+			gint _tmp189__length1;
+			gboolean _tmp190_ = FALSE;
+#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp179_ = SANE_I18N ("None");
+#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp180_ = g_strdup (_tmp179_);
+#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp181_ = SANE_I18N ("none");
+#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp182_ = g_strdup (_tmp181_);
+#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp183_ = g_strdup ("None");
+#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp184_ = g_strdup ("none");
+#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp185_ = g_new0 (gchar*, 4 + 1);
+#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp185_[0] = _tmp180_;
+#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp185_[1] = _tmp182_;
+#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp185_[2] = _tmp183_;
+#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp185_[3] = _tmp184_;
+#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			disable_compression_names = _tmp185_;
+#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			disable_compression_names_length1 = 4;
+#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_disable_compression_names_size_ = disable_compression_names_length1;
-			_tmp175_ = self->priv->handle;
-			_tmp176_ = option;
-			_tmp177_ = index;
-			_tmp178_ = disable_compression_names;
-			_tmp178__length1 = disable_compression_names_length1;
-			_tmp179_ = scanner_set_constrained_string_option (self, _tmp175_, _tmp176_, _tmp177_, _tmp178_, _tmp178__length1, NULL);
-			if (!_tmp179_) {
-				g_warning ("scanner.vala:994: Unable to disable compression, please file a bug");
+#line 1028 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp186_ = self->priv->handle;
+#line 1028 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp187_ = option;
+#line 1028 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp188_ = index;
+#line 1028 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp189_ = disable_compression_names;
+#line 1028 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp189__length1 = disable_compression_names_length1;
+#line 1028 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp190_ = scanner_set_constrained_string_option (self, _tmp186_, _tmp187_, _tmp188_, _tmp189_, _tmp189__length1, NULL);
+#line 1028 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			if (!_tmp190_) {
+#line 1029 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				g_warning ("scanner.vala:1029: Unable to disable compression, please file a bug");
+#line 9707 "scanner.c"
 			}
+#line 1018 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			disable_compression_names = (_vala_array_free (disable_compression_names, disable_compression_names_length1, (GDestroyNotify) g_free), NULL);
+#line 9711 "scanner.c"
 		}
-		_tmp180_ = self->priv->handle;
-		_tmp181_ = SANE_NAME_SCAN_RESOLUTION;
-		_tmp183_ = scanner_get_option_by_name (self, _tmp180_, _tmp181_, &_tmp182_);
-		index = (SANE_Int) _tmp182_;
-		option = _tmp183_;
-		_tmp184_ = option;
-		if (_tmp184_ != NULL) {
-			SANE_Option_Descriptor* _tmp185_;
-			SANE_Value_Type _tmp186_;
-			SANE_Handle _tmp202_;
-			const gchar* _tmp203_;
-			gint _tmp204_ = 0;
-			SANE_Option_Descriptor* _tmp205_ = NULL;
-			SANE_Option_Descriptor* _tmp206_;
-			_tmp185_ = option;
-			_tmp186_ = _tmp185_->type;
-			if (_tmp186_ == SANE_TYPE_FIXED) {
-				SANE_Handle _tmp187_;
-				SANE_Option_Descriptor* _tmp188_;
-				SANE_Int _tmp189_;
-				ScanJob* _tmp190_;
-				gdouble _tmp191_;
-				ScanJob* _tmp192_;
-				gdouble _tmp193_ = 0.0;
-				_tmp187_ = self->priv->handle;
-				_tmp188_ = option;
-				_tmp189_ = index;
-				_tmp190_ = job;
-				_tmp191_ = _tmp190_->dpi;
-				_tmp192_ = job;
-				scanner_set_fixed_option (self, _tmp187_, _tmp188_, _tmp189_, _tmp191_, &_tmp193_);
-				_tmp192_->dpi = _tmp193_;
+#line 1033 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp191_ = self->priv->handle;
+#line 1033 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp192_ = SANE_NAME_SCAN_RESOLUTION;
+#line 1033 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp194_ = scanner_get_option_by_name (self, _tmp191_, _tmp192_, &_tmp193_);
+#line 1033 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		index = (SANE_Int) _tmp193_;
+#line 1033 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		option = _tmp194_;
+#line 1034 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp195_ = option;
+#line 1034 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		if (_tmp195_ != NULL) {
+#line 9727 "scanner.c"
+			SANE_Option_Descriptor* _tmp196_;
+			SANE_Value_Type _tmp197_;
+			SANE_Handle _tmp213_;
+			const gchar* _tmp214_;
+			gint _tmp215_ = 0;
+			SANE_Option_Descriptor* _tmp216_ = NULL;
+			SANE_Option_Descriptor* _tmp217_;
+#line 1036 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp196_ = option;
+#line 1036 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp197_ = _tmp196_->type;
+#line 1036 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			if (_tmp197_ == SANE_TYPE_FIXED) {
+#line 9741 "scanner.c"
+				SANE_Handle _tmp198_;
+				SANE_Option_Descriptor* _tmp199_;
+				SANE_Int _tmp200_;
+				ScanJob* _tmp201_;
+				gdouble _tmp202_;
+				ScanJob* _tmp203_;
+				gdouble _tmp204_ = 0.0;
+#line 1037 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp198_ = self->priv->handle;
+#line 1037 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp199_ = option;
+#line 1037 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp200_ = index;
+#line 1037 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp201_ = job;
+#line 1037 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp202_ = _tmp201_->dpi;
+#line 1037 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp203_ = job;
+#line 1037 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				scanner_set_fixed_option (self, _tmp198_, _tmp199_, _tmp200_, _tmp202_, &_tmp204_);
+#line 1037 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp203_->dpi = _tmp204_;
+#line 9765 "scanner.c"
 			} else {
 				gint dpi = 0;
-				SANE_Handle _tmp194_;
-				SANE_Option_Descriptor* _tmp195_;
-				SANE_Int _tmp196_;
-				ScanJob* _tmp197_;
-				gdouble _tmp198_;
-				gint _tmp199_ = 0;
-				ScanJob* _tmp200_;
-				gint _tmp201_;
-				_tmp194_ = self->priv->handle;
-				_tmp195_ = option;
-				_tmp196_ = index;
-				_tmp197_ = job;
-				_tmp198_ = _tmp197_->dpi;
-				scanner_set_int_option (self, _tmp194_, _tmp195_, _tmp196_, (gint) _tmp198_, &_tmp199_);
-				dpi = _tmp199_;
-				_tmp200_ = job;
-				_tmp201_ = dpi;
-				_tmp200_->dpi = (gdouble) _tmp201_;
+				SANE_Handle _tmp205_;
+				SANE_Option_Descriptor* _tmp206_;
+				SANE_Int _tmp207_;
+				ScanJob* _tmp208_;
+				gdouble _tmp209_;
+				gint _tmp210_ = 0;
+				ScanJob* _tmp211_;
+				gint _tmp212_;
+#line 1041 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp205_ = self->priv->handle;
+#line 1041 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp206_ = option;
+#line 1041 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp207_ = index;
+#line 1041 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp208_ = job;
+#line 1041 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp209_ = _tmp208_->dpi;
+#line 1041 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				scanner_set_int_option (self, _tmp205_, _tmp206_, _tmp207_, (gint) _tmp209_, &_tmp210_);
+#line 1041 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				dpi = _tmp210_;
+#line 1042 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp211_ = job;
+#line 1042 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp212_ = dpi;
+#line 1042 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp211_->dpi = (gdouble) _tmp212_;
+#line 9796 "scanner.c"
 			}
-			_tmp202_ = self->priv->handle;
-			_tmp203_ = SANE_NAME_BIT_DEPTH;
-			_tmp205_ = scanner_get_option_by_name (self, _tmp202_, _tmp203_, &_tmp204_);
-			index = (SANE_Int) _tmp204_;
-			option = _tmp205_;
-			_tmp206_ = option;
-			if (_tmp206_ != NULL) {
-				ScanJob* _tmp207_;
-				gint _tmp208_;
-				_tmp207_ = job;
-				_tmp208_ = _tmp207_->depth;
-				if (_tmp208_ > 0) {
-					SANE_Handle _tmp209_;
-					SANE_Option_Descriptor* _tmp210_;
-					SANE_Int _tmp211_;
-					ScanJob* _tmp212_;
-					gint _tmp213_;
-					_tmp209_ = self->priv->handle;
-					_tmp210_ = option;
-					_tmp211_ = index;
-					_tmp212_ = job;
-					_tmp213_ = _tmp212_->depth;
-					scanner_set_int_option (self, _tmp209_, _tmp210_, _tmp211_, _tmp213_, NULL);
+#line 1044 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp213_ = self->priv->handle;
+#line 1044 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp214_ = SANE_NAME_BIT_DEPTH;
+#line 1044 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp216_ = scanner_get_option_by_name (self, _tmp213_, _tmp214_, &_tmp215_);
+#line 1044 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			index = (SANE_Int) _tmp215_;
+#line 1044 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			option = _tmp216_;
+#line 1045 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp217_ = option;
+#line 1045 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			if (_tmp217_ != NULL) {
+#line 9812 "scanner.c"
+				ScanJob* _tmp218_;
+				gint _tmp219_;
+#line 1047 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp218_ = job;
+#line 1047 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp219_ = _tmp218_->depth;
+#line 1047 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				if (_tmp219_ > 0) {
+#line 9821 "scanner.c"
+					SANE_Handle _tmp220_;
+					SANE_Option_Descriptor* _tmp221_;
+					SANE_Int _tmp222_;
+					ScanJob* _tmp223_;
+					gint _tmp224_;
+#line 1048 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp220_ = self->priv->handle;
+#line 1048 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp221_ = option;
+#line 1048 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp222_ = index;
+#line 1048 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp223_ = job;
+#line 1048 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp224_ = _tmp223_->depth;
+#line 1048 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					scanner_set_int_option (self, _tmp220_, _tmp221_, _tmp222_, _tmp224_, NULL);
+#line 9839 "scanner.c"
 				}
 			}
 		}
-		_tmp214_ = self->priv->handle;
-		_tmp215_ = SANE_NAME_SCAN_BR_X;
-		_tmp217_ = scanner_get_option_by_name (self, _tmp214_, _tmp215_, &_tmp216_);
-		index = (SANE_Int) _tmp216_;
-		option = _tmp217_;
-		_tmp218_ = option;
-		if (_tmp218_ != NULL) {
-			SANE_Option_Descriptor* _tmp219_;
-			SANE_Constraint_Type _tmp220_;
-			_tmp219_ = option;
-			_tmp220_ = _tmp219_->constraint_type;
-			if (_tmp220_ == SANE_CONSTRAINT_RANGE) {
-				SANE_Option_Descriptor* _tmp221_;
-				SANE_Value_Type _tmp222_;
-				_tmp221_ = option;
-				_tmp222_ = _tmp221_->type;
-				if (_tmp222_ == SANE_TYPE_FIXED) {
-					SANE_Handle _tmp223_;
-					SANE_Option_Descriptor* _tmp224_;
-					SANE_Int _tmp225_;
-					SANE_Option_Descriptor* _tmp226_;
-					SANE_Range* _tmp227_;
-					SANE_Word _tmp228_;
-					gdouble _tmp229_ = 0.0;
-					_tmp223_ = self->priv->handle;
-					_tmp224_ = option;
-					_tmp225_ = index;
-					_tmp226_ = option;
-					_tmp227_ = _tmp226_->constraint.range;
-					_tmp228_ = _tmp227_->max;
-					_tmp229_ = SANE_UNFIX ((SANE_Fixed) _tmp228_);
-					scanner_set_fixed_option (self, _tmp223_, _tmp224_, _tmp225_, _tmp229_, NULL);
+#line 1053 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp225_ = self->priv->handle;
+#line 1053 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp226_ = SANE_NAME_SCAN_BR_X;
+#line 1053 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp228_ = scanner_get_option_by_name (self, _tmp225_, _tmp226_, &_tmp227_);
+#line 1053 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		index = (SANE_Int) _tmp227_;
+#line 1053 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		option = _tmp228_;
+#line 1054 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp229_ = option;
+#line 1054 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		if (_tmp229_ != NULL) {
+#line 9857 "scanner.c"
+			SANE_Option_Descriptor* _tmp230_;
+			SANE_Constraint_Type _tmp231_;
+#line 1056 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp230_ = option;
+#line 1056 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp231_ = _tmp230_->constraint_type;
+#line 1056 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			if (_tmp231_ == SANE_CONSTRAINT_RANGE) {
+#line 9866 "scanner.c"
+				SANE_Option_Descriptor* _tmp232_;
+				SANE_Value_Type _tmp233_;
+#line 1058 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp232_ = option;
+#line 1058 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp233_ = _tmp232_->type;
+#line 1058 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				if (_tmp233_ == SANE_TYPE_FIXED) {
+#line 9875 "scanner.c"
+					SANE_Handle _tmp234_;
+					SANE_Option_Descriptor* _tmp235_;
+					SANE_Int _tmp236_;
+					SANE_Option_Descriptor* _tmp237_;
+					SANE_Range* _tmp238_;
+					SANE_Word _tmp239_;
+					gdouble _tmp240_ = 0.0;
+#line 1059 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp234_ = self->priv->handle;
+#line 1059 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp235_ = option;
+#line 1059 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp236_ = index;
+#line 1059 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp237_ = option;
+#line 1059 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp238_ = _tmp237_->constraint.range;
+#line 1059 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp239_ = _tmp238_->max;
+#line 1059 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp240_ = SANE_UNFIX ((SANE_Fixed) _tmp239_);
+#line 1059 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					scanner_set_fixed_option (self, _tmp234_, _tmp235_, _tmp236_, _tmp240_, NULL);
+#line 9899 "scanner.c"
 				} else {
-					SANE_Handle _tmp230_;
-					SANE_Option_Descriptor* _tmp231_;
-					SANE_Int _tmp232_;
-					SANE_Option_Descriptor* _tmp233_;
-					SANE_Range* _tmp234_;
-					SANE_Word _tmp235_;
-					_tmp230_ = self->priv->handle;
-					_tmp231_ = option;
-					_tmp232_ = index;
-					_tmp233_ = option;
-					_tmp234_ = _tmp233_->constraint.range;
-					_tmp235_ = _tmp234_->max;
-					scanner_set_int_option (self, _tmp230_, _tmp231_, _tmp232_, (gint) _tmp235_, NULL);
+					SANE_Handle _tmp241_;
+					SANE_Option_Descriptor* _tmp242_;
+					SANE_Int _tmp243_;
+					SANE_Option_Descriptor* _tmp244_;
+					SANE_Range* _tmp245_;
+					SANE_Word _tmp246_;
+#line 1061 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp241_ = self->priv->handle;
+#line 1061 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp242_ = option;
+#line 1061 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp243_ = index;
+#line 1061 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp244_ = option;
+#line 1061 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp245_ = _tmp244_->constraint.range;
+#line 1061 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp246_ = _tmp245_->max;
+#line 1061 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					scanner_set_int_option (self, _tmp241_, _tmp242_, _tmp243_, (gint) _tmp246_, NULL);
+#line 9921 "scanner.c"
 				}
 			}
 		}
-		_tmp236_ = self->priv->handle;
-		_tmp237_ = SANE_NAME_SCAN_BR_Y;
-		_tmp239_ = scanner_get_option_by_name (self, _tmp236_, _tmp237_, &_tmp238_);
-		index = (SANE_Int) _tmp238_;
-		option = _tmp239_;
-		_tmp240_ = option;
-		if (_tmp240_ != NULL) {
-			SANE_Option_Descriptor* _tmp241_;
-			SANE_Constraint_Type _tmp242_;
-			_tmp241_ = option;
-			_tmp242_ = _tmp241_->constraint_type;
-			if (_tmp242_ == SANE_CONSTRAINT_RANGE) {
-				SANE_Option_Descriptor* _tmp243_;
-				SANE_Value_Type _tmp244_;
-				_tmp243_ = option;
-				_tmp244_ = _tmp243_->type;
-				if (_tmp244_ == SANE_TYPE_FIXED) {
-					SANE_Handle _tmp245_;
-					SANE_Option_Descriptor* _tmp246_;
-					SANE_Int _tmp247_;
-					SANE_Option_Descriptor* _tmp248_;
-					SANE_Range* _tmp249_;
-					SANE_Word _tmp250_;
-					gdouble _tmp251_ = 0.0;
-					_tmp245_ = self->priv->handle;
-					_tmp246_ = option;
-					_tmp247_ = index;
-					_tmp248_ = option;
-					_tmp249_ = _tmp248_->constraint.range;
-					_tmp250_ = _tmp249_->max;
-					_tmp251_ = SANE_UNFIX ((SANE_Fixed) _tmp250_);
-					scanner_set_fixed_option (self, _tmp245_, _tmp246_, _tmp247_, _tmp251_, NULL);
+#line 1064 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp247_ = self->priv->handle;
+#line 1064 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp248_ = SANE_NAME_SCAN_BR_Y;
+#line 1064 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp250_ = scanner_get_option_by_name (self, _tmp247_, _tmp248_, &_tmp249_);
+#line 1064 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		index = (SANE_Int) _tmp249_;
+#line 1064 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		option = _tmp250_;
+#line 1065 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp251_ = option;
+#line 1065 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		if (_tmp251_ != NULL) {
+#line 9939 "scanner.c"
+			SANE_Option_Descriptor* _tmp252_;
+			SANE_Constraint_Type _tmp253_;
+#line 1067 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp252_ = option;
+#line 1067 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp253_ = _tmp252_->constraint_type;
+#line 1067 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			if (_tmp253_ == SANE_CONSTRAINT_RANGE) {
+#line 9948 "scanner.c"
+				SANE_Option_Descriptor* _tmp254_;
+				SANE_Value_Type _tmp255_;
+#line 1069 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp254_ = option;
+#line 1069 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp255_ = _tmp254_->type;
+#line 1069 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				if (_tmp255_ == SANE_TYPE_FIXED) {
+#line 9957 "scanner.c"
+					SANE_Handle _tmp256_;
+					SANE_Option_Descriptor* _tmp257_;
+					SANE_Int _tmp258_;
+					SANE_Option_Descriptor* _tmp259_;
+					SANE_Range* _tmp260_;
+					SANE_Word _tmp261_;
+					gdouble _tmp262_ = 0.0;
+#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp256_ = self->priv->handle;
+#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp257_ = option;
+#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp258_ = index;
+#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp259_ = option;
+#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp260_ = _tmp259_->constraint.range;
+#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp261_ = _tmp260_->max;
+#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp262_ = SANE_UNFIX ((SANE_Fixed) _tmp261_);
+#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					scanner_set_fixed_option (self, _tmp256_, _tmp257_, _tmp258_, _tmp262_, NULL);
+#line 9981 "scanner.c"
 				} else {
-					SANE_Handle _tmp252_;
-					SANE_Option_Descriptor* _tmp253_;
-					SANE_Int _tmp254_;
-					SANE_Option_Descriptor* _tmp255_;
-					SANE_Range* _tmp256_;
-					SANE_Word _tmp257_;
-					_tmp252_ = self->priv->handle;
-					_tmp253_ = option;
-					_tmp254_ = index;
-					_tmp255_ = option;
-					_tmp256_ = _tmp255_->constraint.range;
-					_tmp257_ = _tmp256_->max;
-					scanner_set_int_option (self, _tmp252_, _tmp253_, _tmp254_, (gint) _tmp257_, NULL);
+					SANE_Handle _tmp263_;
+					SANE_Option_Descriptor* _tmp264_;
+					SANE_Int _tmp265_;
+					SANE_Option_Descriptor* _tmp266_;
+					SANE_Range* _tmp267_;
+					SANE_Word _tmp268_;
+#line 1072 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp263_ = self->priv->handle;
+#line 1072 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp264_ = option;
+#line 1072 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp265_ = index;
+#line 1072 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp266_ = option;
+#line 1072 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp267_ = _tmp266_->constraint.range;
+#line 1072 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp268_ = _tmp267_->max;
+#line 1072 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					scanner_set_int_option (self, _tmp263_, _tmp264_, _tmp265_, (gint) _tmp268_, NULL);
+#line 10003 "scanner.c"
 				}
 			}
 		}
-		_tmp258_ = self->priv->handle;
-		_tmp259_ = SANE_NAME_PAGE_WIDTH;
-		_tmp261_ = scanner_get_option_by_name (self, _tmp258_, _tmp259_, &_tmp260_);
-		index = (SANE_Int) _tmp260_;
-		option = _tmp261_;
-		_tmp262_ = option;
-		if (_tmp262_ != NULL) {
-			ScanJob* _tmp263_;
-			gint _tmp264_;
-			_tmp263_ = job;
-			_tmp264_ = _tmp263_->page_width;
-			if (((gdouble) _tmp264_) > 0.0) {
-				SANE_Option_Descriptor* _tmp265_;
-				SANE_Value_Type _tmp266_;
-				_tmp265_ = option;
-				_tmp266_ = _tmp265_->type;
-				if (_tmp266_ == SANE_TYPE_FIXED) {
-					SANE_Handle _tmp267_;
-					SANE_Option_Descriptor* _tmp268_;
-					SANE_Int _tmp269_;
-					ScanJob* _tmp270_;
-					gint _tmp271_;
-					_tmp267_ = self->priv->handle;
-					_tmp268_ = option;
-					_tmp269_ = index;
-					_tmp270_ = job;
-					_tmp271_ = _tmp270_->page_width;
-					scanner_set_fixed_option (self, _tmp267_, _tmp268_, _tmp269_, _tmp271_ / 10.0, NULL);
+#line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp269_ = self->priv->handle;
+#line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp270_ = SANE_NAME_PAGE_WIDTH;
+#line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp272_ = scanner_get_option_by_name (self, _tmp269_, _tmp270_, &_tmp271_);
+#line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		index = (SANE_Int) _tmp271_;
+#line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		option = _tmp272_;
+#line 1077 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp273_ = option;
+#line 1077 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		if (_tmp273_ != NULL) {
+#line 10021 "scanner.c"
+			ScanJob* _tmp274_;
+			gint _tmp275_;
+#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp274_ = job;
+#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp275_ = _tmp274_->page_width;
+#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			if (((gdouble) _tmp275_) > 0.0) {
+#line 10030 "scanner.c"
+				SANE_Option_Descriptor* _tmp276_;
+				SANE_Value_Type _tmp277_;
+#line 1081 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp276_ = option;
+#line 1081 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp277_ = _tmp276_->type;
+#line 1081 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				if (_tmp277_ == SANE_TYPE_FIXED) {
+#line 10039 "scanner.c"
+					SANE_Handle _tmp278_;
+					SANE_Option_Descriptor* _tmp279_;
+					SANE_Int _tmp280_;
+					ScanJob* _tmp281_;
+					gint _tmp282_;
+#line 1082 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp278_ = self->priv->handle;
+#line 1082 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp279_ = option;
+#line 1082 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp280_ = index;
+#line 1082 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp281_ = job;
+#line 1082 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp282_ = _tmp281_->page_width;
+#line 1082 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					scanner_set_fixed_option (self, _tmp278_, _tmp279_, _tmp280_, _tmp282_ / 10.0, NULL);
+#line 10057 "scanner.c"
 				} else {
-					SANE_Handle _tmp272_;
-					SANE_Option_Descriptor* _tmp273_;
-					SANE_Int _tmp274_;
-					ScanJob* _tmp275_;
-					gint _tmp276_;
-					_tmp272_ = self->priv->handle;
-					_tmp273_ = option;
-					_tmp274_ = index;
-					_tmp275_ = job;
-					_tmp276_ = _tmp275_->page_width;
-					scanner_set_int_option (self, _tmp272_, _tmp273_, _tmp274_, _tmp276_ / 10, NULL);
+					SANE_Handle _tmp283_;
+					SANE_Option_Descriptor* _tmp284_;
+					SANE_Int _tmp285_;
+					ScanJob* _tmp286_;
+					gint _tmp287_;
+#line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp283_ = self->priv->handle;
+#line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp284_ = option;
+#line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp285_ = index;
+#line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp286_ = job;
+#line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp287_ = _tmp286_->page_width;
+#line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					scanner_set_int_option (self, _tmp283_, _tmp284_, _tmp285_, _tmp287_ / 10, NULL);
+#line 10076 "scanner.c"
 				}
 			}
 		}
-		_tmp277_ = self->priv->handle;
-		_tmp278_ = SANE_NAME_PAGE_HEIGHT;
-		_tmp280_ = scanner_get_option_by_name (self, _tmp277_, _tmp278_, &_tmp279_);
-		index = (SANE_Int) _tmp279_;
-		option = _tmp280_;
-		_tmp281_ = option;
-		if (_tmp281_ != NULL) {
-			ScanJob* _tmp282_;
-			gint _tmp283_;
-			_tmp282_ = job;
-			_tmp283_ = _tmp282_->page_height;
-			if (((gdouble) _tmp283_) > 0.0) {
-				SANE_Option_Descriptor* _tmp284_;
-				SANE_Value_Type _tmp285_;
-				_tmp284_ = option;
-				_tmp285_ = _tmp284_->type;
-				if (_tmp285_ == SANE_TYPE_FIXED) {
-					SANE_Handle _tmp286_;
-					SANE_Option_Descriptor* _tmp287_;
-					SANE_Int _tmp288_;
-					ScanJob* _tmp289_;
-					gint _tmp290_;
-					_tmp286_ = self->priv->handle;
-					_tmp287_ = option;
-					_tmp288_ = index;
-					_tmp289_ = job;
-					_tmp290_ = _tmp289_->page_height;
-					scanner_set_fixed_option (self, _tmp286_, _tmp287_, _tmp288_, _tmp290_ / 10.0, NULL);
+#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp288_ = self->priv->handle;
+#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp289_ = SANE_NAME_PAGE_HEIGHT;
+#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp291_ = scanner_get_option_by_name (self, _tmp288_, _tmp289_, &_tmp290_);
+#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		index = (SANE_Int) _tmp290_;
+#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		option = _tmp291_;
+#line 1088 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp292_ = option;
+#line 1088 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		if (_tmp292_ != NULL) {
+#line 10094 "scanner.c"
+			ScanJob* _tmp293_;
+			gint _tmp294_;
+#line 1090 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp293_ = job;
+#line 1090 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp294_ = _tmp293_->page_height;
+#line 1090 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			if (((gdouble) _tmp294_) > 0.0) {
+#line 10103 "scanner.c"
+				SANE_Option_Descriptor* _tmp295_;
+				SANE_Value_Type _tmp296_;
+#line 1092 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp295_ = option;
+#line 1092 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp296_ = _tmp295_->type;
+#line 1092 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				if (_tmp296_ == SANE_TYPE_FIXED) {
+#line 10112 "scanner.c"
+					SANE_Handle _tmp297_;
+					SANE_Option_Descriptor* _tmp298_;
+					SANE_Int _tmp299_;
+					ScanJob* _tmp300_;
+					gint _tmp301_;
+#line 1093 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp297_ = self->priv->handle;
+#line 1093 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp298_ = option;
+#line 1093 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp299_ = index;
+#line 1093 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp300_ = job;
+#line 1093 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp301_ = _tmp300_->page_height;
+#line 1093 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					scanner_set_fixed_option (self, _tmp297_, _tmp298_, _tmp299_, _tmp301_ / 10.0, NULL);
+#line 10130 "scanner.c"
 				} else {
-					SANE_Handle _tmp291_;
-					SANE_Option_Descriptor* _tmp292_;
-					SANE_Int _tmp293_;
-					ScanJob* _tmp294_;
-					gint _tmp295_;
-					_tmp291_ = self->priv->handle;
-					_tmp292_ = option;
-					_tmp293_ = index;
-					_tmp294_ = job;
-					_tmp295_ = _tmp294_->page_height;
-					scanner_set_int_option (self, _tmp291_, _tmp292_, _tmp293_, _tmp295_ / 10, NULL);
+					SANE_Handle _tmp302_;
+					SANE_Option_Descriptor* _tmp303_;
+					SANE_Int _tmp304_;
+					ScanJob* _tmp305_;
+					gint _tmp306_;
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp302_ = self->priv->handle;
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp303_ = option;
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp304_ = index;
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp305_ = job;
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp306_ = _tmp305_->page_height;
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					scanner_set_int_option (self, _tmp302_, _tmp303_, _tmp304_, _tmp306_ / 10, NULL);
+#line 10149 "scanner.c"
 				}
 			}
 		}
-		_tmp296_ = self->priv->current_device;
-		if (g_strcmp0 (_tmp296_, "test") == 0) {
-			SANE_Handle _tmp297_;
-			gint _tmp298_ = 0;
-			SANE_Option_Descriptor* _tmp299_ = NULL;
-			SANE_Option_Descriptor* _tmp300_;
-			SANE_Handle _tmp304_;
-			gint _tmp305_ = 0;
-			SANE_Option_Descriptor* _tmp306_ = NULL;
-			SANE_Option_Descriptor* _tmp307_;
-			SANE_Handle _tmp311_;
-			gint _tmp312_ = 0;
-			SANE_Option_Descriptor* _tmp313_ = NULL;
-			SANE_Option_Descriptor* _tmp314_;
-			SANE_Handle _tmp318_;
-			gint _tmp319_ = 0;
-			SANE_Option_Descriptor* _tmp320_ = NULL;
-			SANE_Option_Descriptor* _tmp321_;
-			SANE_Handle _tmp325_;
-			gint _tmp326_ = 0;
-			SANE_Option_Descriptor* _tmp327_ = NULL;
-			SANE_Option_Descriptor* _tmp328_;
-			_tmp297_ = self->priv->handle;
-			_tmp299_ = scanner_get_option_by_name (self, _tmp297_, "hand-scanner", &_tmp298_);
-			index = (SANE_Int) _tmp298_;
-			option = _tmp299_;
-			_tmp300_ = option;
-			if (_tmp300_ != NULL) {
-				SANE_Handle _tmp301_;
-				SANE_Option_Descriptor* _tmp302_;
-				SANE_Int _tmp303_;
-				_tmp301_ = self->priv->handle;
-				_tmp302_ = option;
-				_tmp303_ = index;
-				scanner_set_bool_option (self, _tmp301_, _tmp302_, _tmp303_, FALSE, NULL);
+#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp307_ = self->priv->handle;
+#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp308_ = SANE_NAME_BRIGHTNESS;
+#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp310_ = scanner_get_option_by_name (self, _tmp307_, _tmp308_, &_tmp309_);
+#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		index = (SANE_Int) _tmp309_;
+#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		option = _tmp310_;
+#line 1099 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp311_ = option;
+#line 1099 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		if (_tmp311_ != NULL) {
+#line 10167 "scanner.c"
+			ScanJob* _tmp312_;
+			gint _tmp313_;
+#line 1101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp312_ = job;
+#line 1101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp313_ = _tmp312_->brightness;
+#line 1101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			if (_tmp313_ != 0) {
+#line 10176 "scanner.c"
+				SANE_Option_Descriptor* _tmp314_;
+				ScanJob* _tmp315_;
+				gint _tmp316_;
+				gint _tmp317_ = 0;
+				gint brightness;
+				SANE_Handle _tmp318_;
+				SANE_Option_Descriptor* _tmp319_;
+				SANE_Int _tmp320_;
+				gint _tmp321_;
+#line 1103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp314_ = option;
+#line 1103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp315_ = job;
+#line 1103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp316_ = _tmp315_->brightness;
+#line 1103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp317_ = scanner_scale_int (self, -100, 100, _tmp314_, _tmp316_);
+#line 1103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				brightness = _tmp317_;
+#line 1104 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp318_ = self->priv->handle;
+#line 1104 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp319_ = option;
+#line 1104 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp320_ = index;
+#line 1104 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp321_ = brightness;
+#line 1104 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				scanner_set_int_option (self, _tmp318_, _tmp319_, _tmp320_, _tmp321_, NULL);
+#line 10206 "scanner.c"
 			}
-			_tmp304_ = self->priv->handle;
-			_tmp306_ = scanner_get_option_by_name (self, _tmp304_, "three-pass", &_tmp305_);
-			index = (SANE_Int) _tmp305_;
-			option = _tmp306_;
-			_tmp307_ = option;
-			if (_tmp307_ != NULL) {
-				SANE_Handle _tmp308_;
-				SANE_Option_Descriptor* _tmp309_;
-				SANE_Int _tmp310_;
-				_tmp308_ = self->priv->handle;
-				_tmp309_ = option;
-				_tmp310_ = index;
-				scanner_set_bool_option (self, _tmp308_, _tmp309_, _tmp310_, FALSE, NULL);
+		}
+#line 1107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp322_ = self->priv->handle;
+#line 1107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp323_ = SANE_NAME_CONTRAST;
+#line 1107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp325_ = scanner_get_option_by_name (self, _tmp322_, _tmp323_, &_tmp324_);
+#line 1107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		index = (SANE_Int) _tmp324_;
+#line 1107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		option = _tmp325_;
+#line 1108 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp326_ = option;
+#line 1108 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		if (_tmp326_ != NULL) {
+#line 10223 "scanner.c"
+			ScanJob* _tmp327_;
+			gint _tmp328_;
+#line 1110 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp327_ = job;
+#line 1110 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp328_ = _tmp327_->contrast;
+#line 1110 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			if (_tmp328_ != 0) {
+#line 10232 "scanner.c"
+				SANE_Option_Descriptor* _tmp329_;
+				ScanJob* _tmp330_;
+				gint _tmp331_;
+				gint _tmp332_ = 0;
+				gint contrast;
+				SANE_Handle _tmp333_;
+				SANE_Option_Descriptor* _tmp334_;
+				SANE_Int _tmp335_;
+				gint _tmp336_;
+#line 1112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp329_ = option;
+#line 1112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp330_ = job;
+#line 1112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp331_ = _tmp330_->contrast;
+#line 1112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp332_ = scanner_scale_int (self, -100, 100, _tmp329_, _tmp331_);
+#line 1112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				contrast = _tmp332_;
+#line 1113 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp333_ = self->priv->handle;
+#line 1113 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp334_ = option;
+#line 1113 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp335_ = index;
+#line 1113 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp336_ = contrast;
+#line 1113 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				scanner_set_int_option (self, _tmp333_, _tmp334_, _tmp335_, _tmp336_, NULL);
+#line 10262 "scanner.c"
+			}
+		}
+#line 1118 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp337_ = self->priv->current_device;
+#line 1118 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		if (g_strcmp0 (_tmp337_, "test") == 0) {
+#line 10269 "scanner.c"
+			SANE_Handle _tmp338_;
+			gint _tmp339_ = 0;
+			SANE_Option_Descriptor* _tmp340_ = NULL;
+			SANE_Option_Descriptor* _tmp341_;
+			SANE_Handle _tmp345_;
+			gint _tmp346_ = 0;
+			SANE_Option_Descriptor* _tmp347_ = NULL;
+			SANE_Option_Descriptor* _tmp348_;
+			SANE_Handle _tmp352_;
+			gint _tmp353_ = 0;
+			SANE_Option_Descriptor* _tmp354_ = NULL;
+			SANE_Option_Descriptor* _tmp355_;
+			SANE_Handle _tmp359_;
+			gint _tmp360_ = 0;
+			SANE_Option_Descriptor* _tmp361_ = NULL;
+			SANE_Option_Descriptor* _tmp362_;
+			SANE_Handle _tmp366_;
+			gint _tmp367_ = 0;
+			SANE_Option_Descriptor* _tmp368_ = NULL;
+			SANE_Option_Descriptor* _tmp369_;
+#line 1120 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp338_ = self->priv->handle;
+#line 1120 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp340_ = scanner_get_option_by_name (self, _tmp338_, "hand-scanner", &_tmp339_);
+#line 1120 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			index = (SANE_Int) _tmp339_;
+#line 1120 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			option = _tmp340_;
+#line 1121 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp341_ = option;
+#line 1121 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			if (_tmp341_ != NULL) {
+#line 10302 "scanner.c"
+				SANE_Handle _tmp342_;
+				SANE_Option_Descriptor* _tmp343_;
+				SANE_Int _tmp344_;
+#line 1122 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp342_ = self->priv->handle;
+#line 1122 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp343_ = option;
+#line 1122 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp344_ = index;
+#line 1122 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				scanner_set_bool_option (self, _tmp342_, _tmp343_, _tmp344_, FALSE, NULL);
+#line 10314 "scanner.c"
 			}
-			_tmp311_ = self->priv->handle;
-			_tmp313_ = scanner_get_option_by_name (self, _tmp311_, "test-picture", &_tmp312_);
-			index = (SANE_Int) _tmp312_;
-			option = _tmp313_;
-			_tmp314_ = option;
-			if (_tmp314_ != NULL) {
-				SANE_Handle _tmp315_;
-				SANE_Option_Descriptor* _tmp316_;
-				SANE_Int _tmp317_;
-				_tmp315_ = self->priv->handle;
-				_tmp316_ = option;
-				_tmp317_ = index;
-				scanner_set_string_option (self, _tmp315_, _tmp316_, _tmp317_, "Color pattern", NULL);
+#line 1123 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp345_ = self->priv->handle;
+#line 1123 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp347_ = scanner_get_option_by_name (self, _tmp345_, "three-pass", &_tmp346_);
+#line 1123 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			index = (SANE_Int) _tmp346_;
+#line 1123 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			option = _tmp347_;
+#line 1124 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp348_ = option;
+#line 1124 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			if (_tmp348_ != NULL) {
+#line 10328 "scanner.c"
+				SANE_Handle _tmp349_;
+				SANE_Option_Descriptor* _tmp350_;
+				SANE_Int _tmp351_;
+#line 1125 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp349_ = self->priv->handle;
+#line 1125 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp350_ = option;
+#line 1125 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp351_ = index;
+#line 1125 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				scanner_set_bool_option (self, _tmp349_, _tmp350_, _tmp351_, FALSE, NULL);
+#line 10340 "scanner.c"
 			}
-			_tmp318_ = self->priv->handle;
-			_tmp320_ = scanner_get_option_by_name (self, _tmp318_, "read-delay", &_tmp319_);
-			index = (SANE_Int) _tmp319_;
-			option = _tmp320_;
-			_tmp321_ = option;
-			if (_tmp321_ != NULL) {
-				SANE_Handle _tmp322_;
-				SANE_Option_Descriptor* _tmp323_;
-				SANE_Int _tmp324_;
-				_tmp322_ = self->priv->handle;
-				_tmp323_ = option;
-				_tmp324_ = index;
-				scanner_set_bool_option (self, _tmp322_, _tmp323_, _tmp324_, TRUE, NULL);
+#line 1126 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp352_ = self->priv->handle;
+#line 1126 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp354_ = scanner_get_option_by_name (self, _tmp352_, "test-picture", &_tmp353_);
+#line 1126 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			index = (SANE_Int) _tmp353_;
+#line 1126 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			option = _tmp354_;
+#line 1127 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp355_ = option;
+#line 1127 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			if (_tmp355_ != NULL) {
+#line 10354 "scanner.c"
+				SANE_Handle _tmp356_;
+				SANE_Option_Descriptor* _tmp357_;
+				SANE_Int _tmp358_;
+#line 1128 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp356_ = self->priv->handle;
+#line 1128 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp357_ = option;
+#line 1128 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp358_ = index;
+#line 1128 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				scanner_set_string_option (self, _tmp356_, _tmp357_, _tmp358_, "Color pattern", NULL);
+#line 10366 "scanner.c"
 			}
-			_tmp325_ = self->priv->handle;
-			_tmp327_ = scanner_get_option_by_name (self, _tmp325_, "read-delay-duration", &_tmp326_);
-			index = (SANE_Int) _tmp326_;
-			option = _tmp327_;
-			_tmp328_ = option;
-			if (_tmp328_ != NULL) {
-				SANE_Handle _tmp329_;
-				SANE_Option_Descriptor* _tmp330_;
-				SANE_Int _tmp331_;
-				_tmp329_ = self->priv->handle;
-				_tmp330_ = option;
-				_tmp331_ = index;
-				scanner_set_int_option (self, _tmp329_, _tmp330_, _tmp331_, 200000, NULL);
+#line 1129 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp359_ = self->priv->handle;
+#line 1129 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp361_ = scanner_get_option_by_name (self, _tmp359_, "read-delay", &_tmp360_);
+#line 1129 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			index = (SANE_Int) _tmp360_;
+#line 1129 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			option = _tmp361_;
+#line 1130 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp362_ = option;
+#line 1130 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			if (_tmp362_ != NULL) {
+#line 10380 "scanner.c"
+				SANE_Handle _tmp363_;
+				SANE_Option_Descriptor* _tmp364_;
+				SANE_Int _tmp365_;
+#line 1131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp363_ = self->priv->handle;
+#line 1131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp364_ = option;
+#line 1131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp365_ = index;
+#line 1131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				scanner_set_bool_option (self, _tmp363_, _tmp364_, _tmp365_, TRUE, NULL);
+#line 10392 "scanner.c"
+			}
+#line 1132 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp366_ = self->priv->handle;
+#line 1132 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp368_ = scanner_get_option_by_name (self, _tmp366_, "read-delay-duration", &_tmp367_);
+#line 1132 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			index = (SANE_Int) _tmp367_;
+#line 1132 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			option = _tmp368_;
+#line 1133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp369_ = option;
+#line 1133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			if (_tmp369_ != NULL) {
+#line 10406 "scanner.c"
+				SANE_Handle _tmp370_;
+				SANE_Option_Descriptor* _tmp371_;
+				SANE_Int _tmp372_;
+#line 1134 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp370_ = self->priv->handle;
+#line 1134 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp371_ = option;
+#line 1134 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp372_ = index;
+#line 1134 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				scanner_set_int_option (self, _tmp370_, _tmp371_, _tmp372_, 200000, NULL);
+#line 10418 "scanner.c"
 			}
 		}
+#line 1137 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_START;
+#line 1138 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
+#line 1138 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-	}
-	_tmp332_ = index;
-	_tmp333_ = option;
-	scanner_log_option (self, _tmp332_, _tmp333_);
-	_tmp334_ = option;
-	_tmp335_ = _tmp334_->type;
-	if (_tmp335_ == SANE_TYPE_GROUP) {
+#line 10427 "scanner.c"
+	}
+#line 1141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp373_ = index;
+#line 1141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp374_ = option;
+#line 1141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	scanner_log_option (self, _tmp373_, _tmp374_);
+#line 1144 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp375_ = option;
+#line 1144 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp376_ = _tmp375_->type;
+#line 1144 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	if (_tmp376_ == SANE_TYPE_GROUP) {
+#line 1145 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
+#line 1145 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-	}
-	_tmp336_ = option;
-	_tmp337_ = _tmp336_->cap;
-	if ((_tmp337_ & SANE_CAP_INACTIVE) != ((SANE_Int) 0)) {
+#line 10445 "scanner.c"
+	}
+#line 1148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp377_ = option;
+#line 1148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp378_ = _tmp377_->cap;
+#line 1148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	if ((_tmp378_ & SANE_CAP_INACTIVE) != ((SANE_Int) 0)) {
+#line 1149 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
+#line 1149 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-	}
-	_tmp338_ = option;
-	_tmp339_ = _tmp338_->name;
-	if (_tmp339_ == NULL) {
+#line 10457 "scanner.c"
+	}
+#line 1152 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp379_ = option;
+#line 1152 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp380_ = _tmp379_->name;
+#line 1152 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	if (_tmp380_ == NULL) {
+#line 1153 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
+#line 1153 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-	}
-	_tmp340_ = self->priv->options;
-	_tmp341_ = option;
-	_tmp342_ = _tmp341_->name;
-	_tmp343_ = g_strdup (_tmp342_);
-	_tmp344_ = index;
-	g_hash_table_insert (_tmp340_, _tmp343_, (gpointer) ((gintptr) ((gint) _tmp344_)));
+#line 10469 "scanner.c"
+	}
+#line 1155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp381_ = self->priv->options;
+#line 1155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp382_ = option;
+#line 1155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp383_ = _tmp382_->name;
+#line 1155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp384_ = g_strdup (_tmp383_);
+#line 1155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp385_ = index;
+#line 1155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_hash_table_insert (_tmp381_, _tmp384_, (gpointer) ((gintptr) ((gint) _tmp385_)));
+#line 853 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
+#line 10485 "scanner.c"
 }
 
 
@@ -6782,28 +10502,51 @@ static SANE_Option_Descriptor* scanner_get_option_by_name (Scanner* self, SANE_H
 	SANE_Handle _tmp4_;
 	gint _tmp5_;
 	SANE_Option_Descriptor* _tmp6_ = NULL;
+#line 1158 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, NULL);
+#line 1158 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (name != NULL, NULL);
+#line 1160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->options;
+#line 1160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = name;
+#line 1160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = g_hash_table_lookup (_tmp0_, _tmp1_);
+#line 1160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_vala_index = (gint) ((gintptr) _tmp2_);
+#line 1161 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _vala_index;
+#line 1161 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp3_ == 0) {
+#line 1162 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		result = NULL;
+#line 1162 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (index) {
+#line 1162 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			*index = _vala_index;
+#line 10521 "scanner.c"
 		}
+#line 1162 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
+#line 10525 "scanner.c"
 	}
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = handle;
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = _vala_index;
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = sane_get_option_descriptor (_tmp4_, (SANE_Int) _tmp5_);
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = _tmp6_;
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (index) {
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*index = _vala_index;
+#line 10539 "scanner.c"
 	}
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
+#line 10543 "scanner.c"
 }
 
 
@@ -6813,23 +10556,41 @@ static void scanner_do_complete_document (Scanner* self) {
 	GList* _tmp2_;
 	NotifyDocumentDone* _tmp3_;
 	NotifyDocumentDone* _tmp4_;
+#line 1167 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
+#line 1169 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->handle;
+#line 1169 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	sane_cancel (_tmp0_);
-	g_debug ("scanner.vala:1117: sane_cancel ()");
+#line 1170 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:1170: sane_cancel ()");
+#line 1172 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = self->priv->job_queue;
+#line 1172 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->job_queue = g_list_remove_link (self->priv->job_queue, _tmp1_);
+#line 1174 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->state = SCAN_STATE_IDLE;
+#line 1177 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = self->priv->job_queue;
+#line 1177 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp2_ != NULL) {
+#line 1179 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_OPEN;
+#line 1180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
+#line 10575 "scanner.c"
 	}
+#line 1186 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = notify_document_done_new ();
+#line 1186 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = _tmp3_;
+#line 1186 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_notify (self, (Notify*) _tmp4_);
+#line 1186 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_notify_unref0 (_tmp4_);
+#line 1187 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_set_scanning (self, FALSE);
+#line 10587 "scanner.c"
 }
 
 
@@ -6845,40 +10606,70 @@ static void scanner_do_start (Scanner* self) {
 	gchar* _tmp7_ = NULL;
 	gchar* _tmp8_;
 	SANE_Status _tmp9_;
+#line 1190 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
+#line 1194 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = notify_expect_page_new ();
+#line 1194 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_;
+#line 1194 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_notify (self, (Notify*) _tmp1_);
+#line 1194 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_notify_unref0 (_tmp1_);
+#line 1196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = self->priv->handle;
+#line 1196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = sane_start (_tmp2_);
+#line 1196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp3_;
+#line 1197 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = self->priv->page_number;
+#line 1197 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = self->priv->pass_number;
+#line 1197 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = status;
+#line 1197 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = sane_status_to_string (_tmp6_);
+#line 1197 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = _tmp7_;
-	g_debug ("scanner.vala:1144: sane_start (page=%d, pass=%d) -> %s", _tmp4_, _tmp5_, _tmp8_);
+#line 1197 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:1197: sane_start (page=%d, pass=%d) -> %s", _tmp4_, _tmp5_, _tmp8_);
+#line 1197 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp8_);
+#line 1198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp9_ = status;
+#line 1198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp9_ == SANE_STATUS_GOOD) {
+#line 1199 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_GET_PARAMETERS;
+#line 10639 "scanner.c"
 	} else {
 		SANE_Status _tmp10_;
+#line 1200 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp10_ = status;
+#line 1200 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp10_ == SANE_STATUS_NO_DOCS) {
+#line 1201 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			scanner_do_complete_document (self);
+#line 10648 "scanner.c"
 		} else {
 			SANE_Status _tmp11_;
 			const gchar* _tmp12_ = NULL;
 			SANE_Status _tmp13_;
 			const gchar* _tmp14_ = NULL;
+#line 1204 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp11_ = status;
+#line 1204 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp12_ = sane_strstatus (_tmp11_);
-			g_warning ("scanner.vala:1151: Unable to start device: %s", _tmp12_);
+#line 1204 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			g_warning ("scanner.vala:1204: Unable to start device: %s", _tmp12_);
+#line 1205 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp13_ = status;
+#line 1205 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp14_ = _ ("Unable to start scan");
+#line 1205 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			scanner_fail_scan (self, (gint) _tmp13_, _tmp14_);
+#line 10666 "scanner.c"
 		}
 	}
 }
@@ -6887,51 +10678,88 @@ static void scanner_do_start (Scanner* self) {
 static gchar* sane_frame_to_string (SANE_Frame frame) {
 	gchar* result = NULL;
 	SANE_Frame _tmp0_;
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 	_tmp0_ = frame;
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 	switch (_tmp0_) {
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_GRAY:
+#line 10681 "scanner.c"
 		{
 			gchar* _tmp1_;
+#line 106 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp1_ = g_strdup ("SANE_FRAME_GRAY");
+#line 106 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp1_;
+#line 106 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
+#line 10690 "scanner.c"
 		}
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_RGB:
+#line 10694 "scanner.c"
 		{
 			gchar* _tmp2_;
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp2_ = g_strdup ("SANE_FRAME_RGB");
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp2_;
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
+#line 10703 "scanner.c"
 		}
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_RED:
+#line 10707 "scanner.c"
 		{
 			gchar* _tmp3_;
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp3_ = g_strdup ("SANE_FRAME_RED");
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp3_;
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
+#line 10716 "scanner.c"
 		}
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_GREEN:
+#line 10720 "scanner.c"
 		{
 			gchar* _tmp4_;
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp4_ = g_strdup ("SANE_FRAME_GREEN");
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp4_;
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
+#line 10729 "scanner.c"
 		}
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_BLUE:
+#line 10733 "scanner.c"
 		{
 			gchar* _tmp5_;
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp5_ = g_strdup ("SANE_FRAME_BLUE");
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp5_;
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
+#line 10742 "scanner.c"
 		}
 		default:
 		{
 			SANE_Frame _tmp6_;
 			gchar* _tmp7_ = NULL;
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp6_ = frame;
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp7_ = g_strdup_printf ("SANE_FRAME(%d)", (gint) _tmp6_);
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp7_;
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
+#line 10756 "scanner.c"
 		}
 	}
 }
@@ -7003,165 +10831,311 @@ static void scanner_do_get_parameters (Scanner* self) {
 	gint buffer_size;
 	gint _tmp78_;
 	guchar* _tmp79_ = NULL;
+#line 1211 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
+#line 1213 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->handle;
+#line 1213 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = sane_get_parameters (_tmp0_, &_tmp1_);
+#line 1213 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->parameters = _tmp1_;
+#line 1213 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp2_;
+#line 1214 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = status;
+#line 1214 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = sane_status_to_string (_tmp3_);
+#line 1214 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = _tmp4_;
-	g_debug ("scanner.vala:1161: sane_get_parameters () -> %s", _tmp5_);
+#line 1214 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:1214: sane_get_parameters () -> %s", _tmp5_);
+#line 1214 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp5_);
+#line 1215 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = status;
+#line 1215 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp6_ != SANE_STATUS_GOOD) {
+#line 10852 "scanner.c"
 		SANE_Status _tmp7_;
 		const gchar* _tmp8_ = NULL;
 		SANE_Status _tmp9_;
 		const gchar* _tmp10_ = NULL;
+#line 1217 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = status;
+#line 1217 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = sane_strstatus (_tmp7_);
-		g_warning ("scanner.vala:1164: Unable to get device parameters: %s", _tmp8_);
+#line 1217 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_warning ("scanner.vala:1217: Unable to get device parameters: %s", _tmp8_);
+#line 1218 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = status;
+#line 1218 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp10_ = _ ("Error communicating with scanner");
+#line 1218 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_fail_scan (self, (gint) _tmp9_, _tmp10_);
+#line 1221 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
+#line 10871 "scanner.c"
 	}
+#line 1224 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = self->priv->job_queue;
+#line 1224 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp12_ = _tmp11_->data;
+#line 1224 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp13_ = _scan_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST ((ScanJob*) _tmp12_, TYPE_SCAN_JOB, ScanJob));
+#line 1224 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	job = _tmp13_;
+#line 1228 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp15_ = self->priv->parameters;
+#line 1228 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp16_ = _tmp15_.last_frame;
+#line 1228 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp16_) {
+#line 1228 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = "SANE_TRUE";
+#line 10889 "scanner.c"
 	} else {
+#line 1228 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = "SANE_FALSE";
+#line 10893 "scanner.c"
 	}
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp17_ = self->priv->parameters;
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp18_ = _tmp17_.format;
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp19_ = sane_frame_to_string (_tmp18_);
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp20_ = _tmp19_;
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp21_ = _tmp14_;
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp22_ = self->priv->parameters;
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp23_ = _tmp22_.bytes_per_line;
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp24_ = self->priv->parameters;
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp25_ = _tmp24_.pixels_per_line;
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp26_ = self->priv->parameters;
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp27_ = _tmp26_.lines;
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp28_ = self->priv->parameters;
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp29_ = _tmp28_.depth;
-	g_debug ("scanner.vala:1173: Parameters: format=%s last_frame=%s bytes_per_line=" \
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:1226: Parameters: format=%s last_frame=%s bytes_per_line=" \
 "%d pixels_per_line=%d lines=%d depth=%d", _tmp20_, _tmp21_, _tmp23_, _tmp25_, _tmp27_, _tmp29_);
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp20_);
+#line 1234 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp30_ = scan_page_info_new ();
+#line 1234 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	info = _tmp30_;
+#line 1235 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp31_ = info;
+#line 1235 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp32_ = self->priv->parameters;
+#line 1235 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp33_ = _tmp32_.pixels_per_line;
+#line 1235 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp31_->width = _tmp33_;
+#line 1236 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp34_ = info;
+#line 1236 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp35_ = self->priv->parameters;
+#line 1236 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp36_ = _tmp35_.lines;
+#line 1236 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp34_->height = _tmp36_;
+#line 1237 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp37_ = info;
+#line 1237 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp38_ = self->priv->parameters;
+#line 1237 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp39_ = _tmp38_.depth;
+#line 1237 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp37_->depth = _tmp39_;
+#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp43_ = self->priv->parameters;
+#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp44_ = _tmp43_.depth;
+#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp44_ == 8) {
+#line 10959 "scanner.c"
 		SANE_Parameters _tmp45_;
 		SANE_Frame _tmp46_;
+#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp45_ = self->priv->parameters;
+#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp46_ = _tmp45_.format;
+#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp42_ = _tmp46_ == SANE_FRAME_GRAY;
+#line 10968 "scanner.c"
 	} else {
+#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp42_ = FALSE;
+#line 10972 "scanner.c"
 	}
+#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp47_ = _tmp42_;
+#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp47_) {
+#line 10978 "scanner.c"
 		ScanJob* _tmp48_;
 		gint _tmp49_;
+#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp48_ = job;
+#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp49_ = _tmp48_->depth;
+#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp41_ = _tmp49_ == 2;
+#line 10987 "scanner.c"
 	} else {
+#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp41_ = FALSE;
+#line 10991 "scanner.c"
 	}
+#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp50_ = _tmp41_;
+#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp50_) {
+#line 10997 "scanner.c"
 		ScanJob* _tmp51_;
 		ScanMode _tmp52_;
+#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp51_ = job;
+#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp52_ = _tmp51_->scan_mode;
+#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp40_ = _tmp52_ == SCAN_MODE_GRAY;
+#line 11006 "scanner.c"
 	} else {
+#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp40_ = FALSE;
+#line 11010 "scanner.c"
 	}
+#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp53_ = _tmp40_;
+#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp53_) {
+#line 11016 "scanner.c"
 		ScanPageInfo* _tmp54_;
 		ScanJob* _tmp55_;
 		gint _tmp56_;
+#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp54_ = info;
+#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp55_ = job;
+#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp56_ = _tmp55_->depth;
+#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp54_->depth = _tmp56_;
+#line 11028 "scanner.c"
 	}
+#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp58_ = self->priv->parameters;
+#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp59_ = _tmp58_.format;
+#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp59_ == SANE_FRAME_GRAY) {
+#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp57_ = 1;
+#line 11038 "scanner.c"
 	} else {
+#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp57_ = 3;
+#line 11042 "scanner.c"
 	}
+#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp60_ = info;
+#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp61_ = _tmp57_;
+#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp60_->n_channels = _tmp61_;
+#line 1243 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp62_ = info;
+#line 1243 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp63_ = job;
+#line 1243 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp64_ = _tmp63_->dpi;
+#line 1243 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp62_->dpi = _tmp64_;
+#line 1244 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp65_ = info;
+#line 1244 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp66_ = self->priv->current_device;
+#line 1244 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp67_ = g_strdup (_tmp66_);
+#line 1244 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp65_->device);
+#line 1244 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp65_->device = _tmp67_;
+#line 1246 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp68_ = self->priv->page_number;
+#line 1246 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp69_ = self->priv->notified_page;
+#line 1246 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp68_ != _tmp69_) {
+#line 11074 "scanner.c"
 		ScanJob* _tmp70_;
 		gint _tmp71_;
 		ScanPageInfo* _tmp72_;
 		NotifyGotPageInfo* _tmp73_;
 		NotifyGotPageInfo* _tmp74_;
 		gint _tmp75_;
+#line 1248 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp70_ = job;
+#line 1248 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp71_ = _tmp70_->id;
+#line 1248 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp72_ = info;
+#line 1248 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp73_ = notify_got_page_info_new (_tmp71_, _tmp72_);
+#line 1248 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp74_ = _tmp73_;
+#line 1248 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_notify (self, (Notify*) _tmp74_);
+#line 1248 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_notify_unref0 (_tmp74_);
+#line 1249 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp75_ = self->priv->page_number;
+#line 1249 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->notified_page = _tmp75_;
+#line 11099 "scanner.c"
 	}
+#line 1253 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp76_ = self->priv->parameters;
+#line 1253 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp77_ = _tmp76_.bytes_per_line;
+#line 1253 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	buffer_size = _tmp77_ + 1;
+#line 1254 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp78_ = buffer_size;
+#line 1254 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp79_ = g_new0 (guchar, _tmp78_);
+#line 1254 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer = (g_free (self->priv->buffer), NULL);
+#line 1254 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer = _tmp79_;
+#line 1254 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer_length1 = _tmp78_;
+#line 1254 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->_buffer_size_ = self->priv->buffer_length1;
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->n_used = 0;
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->line_count = 0;
+#line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->pass_number = 0;
+#line 1258 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->state = SCAN_STATE_READ;
+#line 1211 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_page_info_unref0 (info);
+#line 1211 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
+#line 11131 "scanner.c"
 }
 
 
@@ -7178,50 +11152,91 @@ static void scanner_do_complete_page (Scanner* self) {
 	gboolean _tmp8_;
 	ScanJob* _tmp10_;
 	ScanType _tmp11_;
+#line 1261 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
+#line 1263 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->job_queue;
+#line 1263 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->data;
+#line 1263 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _scan_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST ((ScanJob*) _tmp1_, TYPE_SCAN_JOB, ScanJob));
+#line 1263 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	job = _tmp2_;
+#line 1265 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = job;
+#line 1265 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = _tmp3_->id;
+#line 1265 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = notify_page_done_new (_tmp4_);
+#line 1265 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = _tmp5_;
+#line 1265 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_notify (self, (Notify*) _tmp6_);
+#line 1265 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_notify_unref0 (_tmp6_);
+#line 1268 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = self->priv->parameters;
+#line 1268 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = _tmp7_.last_frame;
+#line 1268 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!_tmp8_) {
+#line 11176 "scanner.c"
 		gint _tmp9_;
+#line 1270 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = self->priv->pass_number;
+#line 1270 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->pass_number = _tmp9_ + 1;
+#line 1271 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_START;
+#line 1272 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
+#line 1272 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
+#line 11188 "scanner.c"
 	}
+#line 1276 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = job;
+#line 1276 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = _tmp10_->type;
+#line 1276 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp11_ != SCAN_TYPE_SINGLE) {
+#line 11196 "scanner.c"
 		gint _tmp12_;
 		ScanJob* _tmp13_;
 		gint _tmp14_;
 		NotifyPageDone* _tmp15_;
 		NotifyPageDone* _tmp16_;
+#line 1278 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp12_ = self->priv->page_number;
+#line 1278 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->page_number = _tmp12_ + 1;
+#line 1279 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->pass_number = 0;
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp13_ = job;
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = _tmp13_->id;
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp15_ = notify_page_done_new (_tmp14_);
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp16_ = _tmp15_;
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_notify (self, (Notify*) _tmp16_);
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_notify_unref0 (_tmp16_);
+#line 1281 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_START;
+#line 1282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
+#line 1282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
+#line 11226 "scanner.c"
 	}
+#line 1285 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_do_complete_document (self);
+#line 1261 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
+#line 11232 "scanner.c"
 }
 
 
@@ -7261,111 +11276,204 @@ static void scanner_do_read (Scanner* self) {
 	gint _tmp42_;
 	SANE_Parameters _tmp43_;
 	gint _tmp44_;
+#line 1288 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
+#line 1290 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->job_queue;
+#line 1290 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->data;
+#line 1290 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _scan_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST ((ScanJob*) _tmp1_, TYPE_SCAN_JOB, ScanJob));
+#line 1290 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	job = _tmp2_;
+#line 1293 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = self->priv->buffer;
+#line 1293 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3__length1 = self->priv->buffer_length1;
+#line 1293 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = self->priv->n_used;
+#line 1293 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	n_to_read = _tmp3__length1 - _tmp4_;
+#line 1296 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = self->priv->buffer;
+#line 1296 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5__length1 = self->priv->buffer_length1;
+#line 1296 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	b = (guchar*) _tmp5_;
+#line 1297 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = self->priv->handle;
+#line 1297 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = b;
+#line 1297 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = self->priv->n_used;
+#line 1297 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp9_ = n_to_read;
+#line 1297 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = sane_read (_tmp6_, (guint8*) (_tmp7_ + _tmp8_), (SANE_Int) _tmp9_, &_tmp10_);
+#line 1297 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	n_read = _tmp10_;
+#line 1297 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp11_;
+#line 1298 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp12_ = n_to_read;
+#line 1298 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp13_ = status;
+#line 1298 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp14_ = sane_status_to_string (_tmp13_);
+#line 1298 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp15_ = _tmp14_;
+#line 1298 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp16_ = n_read;
-	g_debug ("scanner.vala:1245: sane_read (%d) -> (%s, %d)", _tmp12_, _tmp15_, (gint) _tmp16_);
+#line 1298 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:1298: sane_read (%d) -> (%s, %d)", _tmp12_, _tmp15_, (gint) _tmp16_);
+#line 1298 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp15_);
+#line 1301 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp17_ = status;
+#line 1301 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp17_ == SANE_STATUS_EOF) {
+#line 11328 "scanner.c"
 		gboolean _tmp18_ = FALSE;
 		SANE_Parameters _tmp19_;
 		gint _tmp20_;
 		gboolean _tmp24_;
 		gint _tmp28_;
+#line 1303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp19_ = self->priv->parameters;
+#line 1303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp20_ = _tmp19_.lines;
+#line 1303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp20_ > 0) {
+#line 11340 "scanner.c"
 			gint _tmp21_;
 			SANE_Parameters _tmp22_;
 			gint _tmp23_;
+#line 1303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp21_ = self->priv->line_count;
+#line 1303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp22_ = self->priv->parameters;
+#line 1303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp23_ = _tmp22_.lines;
+#line 1303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp18_ = _tmp21_ != _tmp23_;
+#line 11352 "scanner.c"
 		} else {
+#line 1303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp18_ = FALSE;
+#line 11356 "scanner.c"
 		}
+#line 1303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp24_ = _tmp18_;
+#line 1303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp24_) {
+#line 11362 "scanner.c"
 			gint _tmp25_;
 			SANE_Parameters _tmp26_;
 			gint _tmp27_;
+#line 1304 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp25_ = self->priv->line_count;
+#line 1304 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp26_ = self->priv->parameters;
+#line 1304 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp27_ = _tmp26_.lines;
-			g_warning ("scanner.vala:1251: Scan completed with %d lines, expected %d lines", _tmp25_, _tmp27_);
+#line 1304 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			g_warning ("scanner.vala:1304: Scan completed with %d lines, expected %d lines", _tmp25_, _tmp27_);
+#line 11374 "scanner.c"
 		}
+#line 1305 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp28_ = self->priv->n_used;
+#line 1305 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp28_ > 0) {
+#line 11380 "scanner.c"
 			gint _tmp29_;
+#line 1306 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_ = self->priv->n_used;
-			g_warning ("scanner.vala:1253: Scan complete with %d bytes of unused data", _tmp29_);
+#line 1306 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			g_warning ("scanner.vala:1306: Scan complete with %d bytes of unused data", _tmp29_);
+#line 11386 "scanner.c"
 		}
+#line 1307 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_do_complete_page (self);
+#line 1308 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
+#line 1308 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
+#line 11394 "scanner.c"
 	}
+#line 1312 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp30_ = status;
+#line 1312 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp30_ != SANE_STATUS_GOOD) {
+#line 11400 "scanner.c"
 		SANE_Status _tmp31_;
 		const gchar* _tmp32_ = NULL;
 		SANE_Status _tmp33_;
 		const gchar* _tmp34_ = NULL;
+#line 1314 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp31_ = status;
+#line 1314 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp32_ = sane_strstatus (_tmp31_);
-		g_warning ("scanner.vala:1261: Unable to read frame from device: %s", _tmp32_);
+#line 1314 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_warning ("scanner.vala:1314: Unable to read frame from device: %s", _tmp32_);
+#line 1315 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp33_ = status;
+#line 1315 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp34_ = _ ("Error communicating with scanner");
+#line 1315 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_fail_scan (self, (gint) _tmp33_, _tmp34_);
+#line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
+#line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
+#line 11421 "scanner.c"
 	}
+#line 1321 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	full_read = FALSE;
+#line 1322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp36_ = self->priv->n_used;
+#line 1322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp36_ == 0) {
+#line 11429 "scanner.c"
 		SANE_Int _tmp37_;
 		guchar* _tmp38_;
 		gint _tmp38__length1;
+#line 1322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp37_ = n_read;
+#line 1322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp38_ = self->priv->buffer;
+#line 1322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp38__length1 = self->priv->buffer_length1;
+#line 1322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp35_ = _tmp37_ == ((SANE_Int) _tmp38__length1);
+#line 11441 "scanner.c"
 	} else {
+#line 1322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp35_ = FALSE;
+#line 11445 "scanner.c"
 	}
+#line 1322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp39_ = _tmp35_;
+#line 1322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp39_) {
+#line 1323 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		full_read = TRUE;
+#line 11453 "scanner.c"
 	}
+#line 1324 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp40_ = self->priv->n_used;
+#line 1324 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp41_ = n_read;
+#line 1324 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->n_used = _tmp40_ + ((gint) _tmp41_);
+#line 1327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp42_ = self->priv->n_used;
+#line 1327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp43_ = self->priv->parameters;
+#line 1327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp44_ = _tmp43_.bytes_per_line;
+#line 1327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp42_ >= _tmp44_) {
+#line 11469 "scanner.c"
 		ScanLine* _tmp45_;
 		ScanLine* line;
 		SANE_Parameters _tmp46_;
@@ -7416,113 +11524,211 @@ static void scanner_do_read (Scanner* self) {
 		ScanLine* _tmp162_;
 		NotifyGotLine* _tmp163_;
 		NotifyGotLine* _tmp164_;
+#line 1329 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp45_ = scan_line_new ();
+#line 1329 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		line = _tmp45_;
+#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp46_ = self->priv->parameters;
+#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp47_ = _tmp46_.format;
+#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		switch (_tmp47_) {
+#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_GRAY:
+#line 11532 "scanner.c"
 			{
 				ScanLine* _tmp48_;
+#line 1333 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp48_ = line;
+#line 1333 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp48_->channel = 0;
+#line 1334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
+#line 11541 "scanner.c"
 			}
+#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_RGB:
+#line 11545 "scanner.c"
 			{
 				ScanLine* _tmp49_;
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp49_ = line;
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp49_->channel = -1;
+#line 1337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
+#line 11554 "scanner.c"
 			}
+#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_RED:
+#line 11558 "scanner.c"
 			{
 				ScanLine* _tmp50_;
+#line 1339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp50_ = line;
+#line 1339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp50_->channel = 0;
+#line 1340 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
+#line 11567 "scanner.c"
 			}
+#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_GREEN:
+#line 11571 "scanner.c"
 			{
 				ScanLine* _tmp51_;
+#line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp51_ = line;
+#line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp51_->channel = 1;
+#line 1343 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
+#line 11580 "scanner.c"
 			}
+#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_BLUE:
+#line 11584 "scanner.c"
 			{
 				ScanLine* _tmp52_;
+#line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp52_ = line;
+#line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp52_->channel = 2;
+#line 1346 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
+#line 11593 "scanner.c"
 			}
 			default:
+#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
+#line 11598 "scanner.c"
 		}
+#line 1348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp53_ = line;
+#line 1348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp54_ = self->priv->parameters;
+#line 1348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp55_ = _tmp54_.pixels_per_line;
+#line 1348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp53_->width = _tmp55_;
+#line 1349 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp56_ = line;
+#line 1349 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp57_ = self->priv->parameters;
+#line 1349 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp58_ = _tmp57_.depth;
+#line 1349 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp56_->depth = _tmp58_;
+#line 1350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp59_ = line;
+#line 1350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp60_ = self->priv->buffer;
+#line 1350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp60__length1 = self->priv->buffer_length1;
+#line 1350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->buffer = NULL;
+#line 1350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp59_->data = (g_free (_tmp59_->data), NULL);
+#line 1350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp59_->data = _tmp60_;
+#line 1350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp59_->data_length1 = _tmp60__length1;
+#line 1351 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp61_ = line;
+#line 1351 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp62_ = self->priv->parameters;
+#line 1351 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp63_ = _tmp62_.bytes_per_line;
+#line 1351 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp61_->data_length = _tmp63_;
+#line 1352 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp64_ = line;
+#line 1352 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp65_ = self->priv->line_count;
+#line 1352 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp64_->number = _tmp65_;
+#line 1353 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp66_ = line;
+#line 1353 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp67_ = self->priv->n_used;
+#line 1353 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp68_ = line;
+#line 1353 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp69_ = _tmp68_->data_length;
+#line 1353 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp66_->n_lines = _tmp67_ / _tmp69_;
+#line 1355 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp70_ = self->priv->line_count;
+#line 1355 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp71_ = line;
+#line 1355 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp72_ = _tmp71_->n_lines;
+#line 1355 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->line_count = _tmp70_ + _tmp72_;
+#line 1358 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp73_ = self->priv->buffer;
+#line 1358 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp73__length1 = self->priv->buffer_length1;
+#line 1358 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		buffer_size = _tmp73__length1;
+#line 1359 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp74_ = full_read;
+#line 1359 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp74_) {
+#line 11672 "scanner.c"
 			gint _tmp75_;
 			SANE_Parameters _tmp76_;
 			gint _tmp77_;
+#line 1360 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp75_ = buffer_size;
+#line 1360 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp76_ = self->priv->parameters;
+#line 1360 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp77_ = _tmp76_.bytes_per_line;
+#line 1360 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			buffer_size = _tmp75_ + _tmp77_;
+#line 11684 "scanner.c"
 		}
+#line 1362 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp78_ = buffer_size;
+#line 1362 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp79_ = g_new0 (guchar, _tmp78_);
+#line 1362 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->buffer = (g_free (self->priv->buffer), NULL);
+#line 1362 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->buffer = _tmp79_;
+#line 1362 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->buffer_length1 = _tmp78_;
+#line 1362 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->_buffer_size_ = self->priv->buffer_length1;
+#line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp80_ = self->priv->n_used;
+#line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp81_ = line;
+#line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp82_ = _tmp81_->n_lines;
+#line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp83_ = line;
+#line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp84_ = _tmp83_->data_length;
+#line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		n_remaining = _tmp80_ - (_tmp82_ * _tmp84_);
+#line 1364 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->n_used = 0;
+#line 11712 "scanner.c"
 		{
 			gint i;
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			i = 0;
+#line 11717 "scanner.c"
 			{
 				gboolean _tmp85_;
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp85_ = TRUE;
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				while (TRUE) {
+#line 11724 "scanner.c"
 					gboolean _tmp86_;
 					gint _tmp88_;
 					gint _tmp89_;
@@ -7540,86 +11746,155 @@ static void scanner_do_read (Scanner* self) {
 					guchar _tmp99_;
 					guchar _tmp100_;
 					gint _tmp101_;
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp86_ = _tmp85_;
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp86_) {
+#line 11746 "scanner.c"
 						gint _tmp87_;
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp87_ = i;
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						i = _tmp87_ + 1;
+#line 11752 "scanner.c"
 					}
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp85_ = FALSE;
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp88_ = i;
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp89_ = n_remaining;
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!(_tmp88_ < _tmp89_)) {
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						break;
+#line 11764 "scanner.c"
 					}
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp90_ = self->priv->buffer;
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp90__length1 = self->priv->buffer_length1;
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp91_ = i;
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp92_ = line;
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp93_ = _tmp92_->data;
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp93__length1 = _tmp92_->data_length1;
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp94_ = i;
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp95_ = line;
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp96_ = _tmp95_->n_lines;
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp97_ = line;
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp98_ = _tmp97_->data_length;
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp99_ = _tmp93_[_tmp94_ + (_tmp96_ * _tmp98_)];
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp90_[_tmp91_] = _tmp99_;
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp100_ = _tmp90_[_tmp91_];
+#line 1368 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp101_ = self->priv->n_used;
+#line 1368 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					self->priv->n_used = _tmp101_ + 1;
+#line 11798 "scanner.c"
 				}
 			}
 		}
+#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp105_ = self->priv->parameters;
+#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp106_ = _tmp105_.depth;
+#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp106_ == 8) {
+#line 11808 "scanner.c"
 			SANE_Parameters _tmp107_;
 			SANE_Frame _tmp108_;
+#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp107_ = self->priv->parameters;
+#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp108_ = _tmp107_.format;
+#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp104_ = _tmp108_ == SANE_FRAME_GRAY;
+#line 11817 "scanner.c"
 		} else {
+#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp104_ = FALSE;
+#line 11821 "scanner.c"
 		}
+#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp109_ = _tmp104_;
+#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp109_) {
+#line 11827 "scanner.c"
 			ScanJob* _tmp110_;
 			gint _tmp111_;
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp110_ = job;
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp111_ = _tmp110_->depth;
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp103_ = _tmp111_ == 2;
+#line 11836 "scanner.c"
 		} else {
+#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp103_ = FALSE;
+#line 11840 "scanner.c"
 		}
+#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp112_ = _tmp103_;
+#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp112_) {
+#line 11846 "scanner.c"
 			ScanJob* _tmp113_;
 			ScanMode _tmp114_;
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp113_ = job;
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp114_ = _tmp113_->scan_mode;
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp102_ = _tmp114_ == SCAN_MODE_GRAY;
+#line 11855 "scanner.c"
 		} else {
+#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp102_ = FALSE;
+#line 11859 "scanner.c"
 		}
+#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp115_ = _tmp102_;
+#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp115_) {
+#line 11865 "scanner.c"
 			guchar block;
 			gint write_offset;
 			gint block_shift;
 			ScanLine* _tmp157_;
 			ScanLine* _tmp158_;
 			gint _tmp159_;
+#line 1376 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			block = (guchar) 0;
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			write_offset = 0;
+#line 1378 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			block_shift = 6;
+#line 11878 "scanner.c"
 			{
 				gint i;
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
+#line 11883 "scanner.c"
 				{
 					gboolean _tmp116_;
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp116_ = TRUE;
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
+#line 11890 "scanner.c"
 						gboolean _tmp117_;
 						gint _tmp119_;
 						ScanLine* _tmp120_;
@@ -7629,30 +11904,53 @@ static void scanner_do_read (Scanner* self) {
 						gint _tmp124_;
 						gint offset;
 						gint _tmp150_;
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp117_ = _tmp116_;
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp117_) {
+#line 11904 "scanner.c"
 							gint _tmp118_;
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp118_ = i;
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							i = _tmp118_ + 1;
+#line 11910 "scanner.c"
 						}
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp116_ = FALSE;
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp119_ = i;
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp120_ = line;
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp121_ = _tmp120_->n_lines;
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!(_tmp119_ < _tmp121_)) {
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
+#line 11924 "scanner.c"
 						}
+#line 1381 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp122_ = i;
+#line 1381 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp123_ = line;
+#line 1381 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp124_ = _tmp123_->data_length;
+#line 1381 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						offset = _tmp122_ * _tmp124_;
+#line 11934 "scanner.c"
 						{
 							gint x;
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							x = 0;
+#line 11939 "scanner.c"
 							{
 								gboolean _tmp125_;
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 								_tmp125_ = TRUE;
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 								while (TRUE) {
+#line 11946 "scanner.c"
 									gboolean _tmp126_;
 									gint _tmp128_;
 									ScanLine* _tmp129_;
@@ -7670,50 +11968,91 @@ static void scanner_do_read (Scanner* self) {
 									guchar _tmp140_;
 									gint _tmp141_;
 									gint _tmp142_;
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp126_ = _tmp125_;
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									if (!_tmp126_) {
+#line 11968 "scanner.c"
 										gint _tmp127_;
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp127_ = x;
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										x = _tmp127_ + 1;
+#line 11974 "scanner.c"
 									}
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp125_ = FALSE;
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp128_ = x;
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp129_ = line;
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp130_ = _tmp129_->width;
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									if (!(_tmp128_ < _tmp130_)) {
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										break;
+#line 11988 "scanner.c"
 									}
+#line 1384 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp131_ = line;
+#line 1384 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp132_ = _tmp131_->data;
+#line 1384 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp132__length1 = _tmp131_->data_length1;
+#line 1384 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp133_ = offset;
+#line 1384 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp134_ = x;
+#line 1384 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp135_ = _tmp132_[_tmp133_ + _tmp134_];
+#line 1384 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									p = _tmp135_;
+#line 1387 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp136_ = p;
+#line 1387 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									if (((gint) _tmp136_) >= 192) {
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										sample = (guchar) 3;
+#line 12010 "scanner.c"
 									} else {
 										guchar _tmp137_;
+#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp137_ = p;
+#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										if (((gint) _tmp137_) >= 128) {
+#line 1390 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 											sample = (guchar) 2;
+#line 12019 "scanner.c"
 										} else {
 											guchar _tmp138_;
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 											_tmp138_ = p;
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 											if (((gint) _tmp138_) >= 64) {
+#line 1392 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 												sample = (guchar) 1;
+#line 12028 "scanner.c"
 											} else {
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 												sample = (guchar) 0;
+#line 12032 "scanner.c"
 											}
 										}
 									}
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp139_ = block;
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp140_ = sample;
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp141_ = block_shift;
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									block = _tmp139_ | (_tmp140_ << _tmp141_);
+#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp142_ = block_shift;
+#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									if (_tmp142_ == 0) {
+#line 12048 "scanner.c"
 										ScanLine* _tmp143_;
 										guchar* _tmp144_;
 										gint _tmp144__length1;
@@ -7721,27 +12060,45 @@ static void scanner_do_read (Scanner* self) {
 										guchar _tmp146_;
 										guchar _tmp147_;
 										gint _tmp148_;
+#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp143_ = line;
+#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp144_ = _tmp143_->data;
+#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp144__length1 = _tmp143_->data_length1;
+#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp145_ = write_offset;
+#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp146_ = block;
+#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp144_[_tmp145_] = _tmp146_;
+#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp147_ = _tmp144_[_tmp145_];
+#line 1400 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp148_ = write_offset;
+#line 1400 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										write_offset = _tmp148_ + 1;
+#line 1401 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										block = (guchar) 0;
+#line 1402 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										block_shift = 6;
+#line 12078 "scanner.c"
 									} else {
 										gint _tmp149_;
+#line 1405 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp149_ = block_shift;
+#line 1405 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										block_shift = _tmp149_ - 2;
+#line 12085 "scanner.c"
 									}
 								}
 							}
 						}
+#line 1409 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp150_ = block_shift;
+#line 1409 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp150_ != 6) {
+#line 12094 "scanner.c"
 							ScanLine* _tmp151_;
 							guchar* _tmp152_;
 							gint _tmp152__length1;
@@ -7749,41 +12106,71 @@ static void scanner_do_read (Scanner* self) {
 							guchar _tmp154_;
 							guchar _tmp155_;
 							gint _tmp156_;
+#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp151_ = line;
+#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp152_ = _tmp151_->data;
+#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp152__length1 = _tmp151_->data_length1;
+#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp153_ = write_offset;
+#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp154_ = block;
+#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp152_[_tmp153_] = _tmp154_;
+#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp155_ = _tmp152_[_tmp153_];
+#line 1412 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp156_ = write_offset;
+#line 1412 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							write_offset = _tmp156_ + 1;
+#line 1413 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							block = (guchar) 0;
+#line 1414 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							block_shift = 6;
+#line 12124 "scanner.c"
 						}
 					}
 				}
 			}
+#line 1418 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp157_ = line;
+#line 1418 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp158_ = line;
+#line 1418 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp159_ = _tmp158_->width;
+#line 1418 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp157_->data_length = ((_tmp159_ * 2) + 7) / 8;
+#line 12137 "scanner.c"
 		}
+#line 1421 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp160_ = job;
+#line 1421 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp161_ = _tmp160_->id;
+#line 1421 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp162_ = line;
+#line 1421 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp163_ = notify_got_line_new (_tmp161_, _tmp162_);
+#line 1421 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp164_ = _tmp163_;
+#line 1421 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_notify (self, (Notify*) _tmp164_);
+#line 1421 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_notify_unref0 (_tmp164_);
+#line 1327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_line_unref0 (line);
+#line 12155 "scanner.c"
 	}
+#line 1288 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
+#line 12159 "scanner.c"
 }
 
 
 static void _scanner_authorization_cb_sane_authcallback (const gchar* resource, gchar* username, gchar* password) {
+#line 1430 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_authorization_cb (resource, username, -1, password, -1);
+#line 12166 "scanner.c"
 }
 
 
@@ -7803,131 +12190,235 @@ static void* scanner_scan_thread (Scanner* self) {
 	gint _tmp11_ = 0;
 	SANE_Int _tmp12_;
 	gint _tmp13_ = 0;
+#line 1425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, NULL);
+#line 1427 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->state = SCAN_STATE_IDLE;
+#line 1430 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = sane_init (&_tmp0_, _scanner_authorization_cb_sane_authcallback);
+#line 1430 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	version_code = _tmp0_;
+#line 1430 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp1_;
+#line 1431 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = status;
+#line 1431 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = sane_status_to_string (_tmp2_);
+#line 1431 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = _tmp3_;
-	g_debug ("scanner.vala:1378: sane_init () -> %s", _tmp4_);
+#line 1431 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:1431: sane_init () -> %s", _tmp4_);
+#line 1431 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp4_);
+#line 1432 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = status;
+#line 1432 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp5_ != SANE_STATUS_GOOD) {
+#line 12210 "scanner.c"
 		SANE_Status _tmp6_;
 		const gchar* _tmp7_ = NULL;
+#line 1434 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = status;
+#line 1434 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = sane_strstatus (_tmp6_);
-		g_warning ("scanner.vala:1381: Unable to initialize SANE backend: %s", _tmp7_);
+#line 1434 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_warning ("scanner.vala:1434: Unable to initialize SANE backend: %s", _tmp7_);
+#line 1435 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		result = NULL;
+#line 1435 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
+#line 12223 "scanner.c"
 	}
+#line 1437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = version_code;
+#line 1437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp9_ = SANE_VERSION_MAJOR (_tmp8_);
+#line 1437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = version_code;
+#line 1437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = SANE_VERSION_MINOR (_tmp10_);
+#line 1437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp12_ = version_code;
+#line 1437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp13_ = SANE_VERSION_BUILD (_tmp12_);
-	g_debug ("scanner.vala:1384: SANE version %d.%d.%d", _tmp9_, _tmp11_, _tmp13_);
+#line 1437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:1437: SANE version %d.%d.%d", _tmp9_, _tmp11_, _tmp13_);
+#line 1443 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_redetect (self);
+#line 1445 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	while (TRUE) {
+#line 12243 "scanner.c"
 		gboolean _tmp14_ = FALSE;
 		ScanState _tmp15_;
+#line 1445 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = scanner_handle_requests (self);
+#line 1445 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (!_tmp14_) {
+#line 1445 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
+#line 12252 "scanner.c"
 		}
+#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp15_ = self->priv->state;
+#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		switch (_tmp15_) {
+#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_IDLE:
+#line 12260 "scanner.c"
 			{
 				GList* _tmp16_;
+#line 1450 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp16_ = self->priv->job_queue;
+#line 1450 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (_tmp16_ != NULL) {
+#line 1452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					scanner_set_scanning (self, TRUE);
+#line 1453 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					self->priv->state = SCAN_STATE_OPEN;
+#line 12271 "scanner.c"
 				}
+#line 1455 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
+#line 12275 "scanner.c"
 			}
+#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_REDETECT:
+#line 12279 "scanner.c"
 			{
+#line 1457 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_redetect (self);
+#line 1458 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
+#line 12285 "scanner.c"
 			}
+#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_OPEN:
+#line 12289 "scanner.c"
 			{
+#line 1460 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_open (self);
+#line 1461 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
+#line 12295 "scanner.c"
 			}
+#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_GET_OPTION:
+#line 12299 "scanner.c"
 			{
+#line 1463 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_get_option (self);
+#line 1464 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
+#line 12305 "scanner.c"
 			}
+#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_START:
+#line 12309 "scanner.c"
 			{
+#line 1466 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_start (self);
+#line 1467 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
+#line 12315 "scanner.c"
 			}
+#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_GET_PARAMETERS:
+#line 12319 "scanner.c"
 			{
+#line 1469 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_get_parameters (self);
+#line 1470 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
+#line 12325 "scanner.c"
 			}
+#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_READ:
+#line 12329 "scanner.c"
 			{
+#line 1472 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_read (self);
+#line 1473 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
+#line 12335 "scanner.c"
 			}
 			default:
+#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
+#line 12340 "scanner.c"
 		}
 	}
+#line 1477 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = NULL;
+#line 1477 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
+#line 12347 "scanner.c"
 }
 
 
 static gpointer _scanner_scan_thread_gthread_func (gpointer self) {
 	gpointer result;
 	result = scanner_scan_thread (self);
+#line 1484 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_unref (self);
+#line 1484 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
+#line 12358 "scanner.c"
 }
 
 
 void scanner_start (Scanner* self) {
 	GError * _inner_error_ = NULL;
+#line 1480 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
+#line 12366 "scanner.c"
 	{
-		GThread* _tmp0_ = NULL;
+		GThread* _tmp0_;
 		GThread* _tmp1_;
-		_tmp0_ = g_thread_create (_scanner_scan_thread_gthread_func, scanner_ref (self), TRUE, &_inner_error_);
+#line 1484 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp0_ = g_thread_try_new ("scan-thread", _scanner_scan_thread_gthread_func, scanner_ref (self), &_inner_error_);
+#line 1484 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp1_ = _tmp0_;
+#line 1484 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_inner_error_ != NULL) {
-			goto __catch14_g_error;
+#line 12376 "scanner.c"
+			goto __catch15_g_error;
 		}
+#line 1484 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_g_thread_unref0 (self->priv->thread);
+#line 1484 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->thread = _tmp1_;
+#line 12383 "scanner.c"
 	}
-	goto __finally14;
-	__catch14_g_error:
+	goto __finally15;
+	__catch15_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp2_;
 		const gchar* _tmp3_;
+#line 1482 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		e = _inner_error_;
+#line 1482 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_inner_error_ = NULL;
+#line 1488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp2_ = e;
+#line 1488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = _tmp2_->message;
-		g_critical ("scanner.vala:1435: Unable to create thread: %s", _tmp3_);
+#line 1488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_critical ("scanner.vala:1488: Unable to create thread: %s", _tmp3_);
+#line 1482 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_error_free0 (e);
+#line 12403 "scanner.c"
 	}
-	__finally14:
+	__finally15:
+#line 1482 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_inner_error_ != NULL) {
+#line 1482 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 1482 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_clear_error (&_inner_error_);
+#line 1482 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
+#line 12414 "scanner.c"
 	}
 }
 
@@ -7936,71 +12427,119 @@ void scanner_redetect (Scanner* self) {
 	gboolean _tmp0_;
 	GAsyncQueue* _tmp1_;
 	RequestRedetect* _tmp2_;
+#line 1492 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
+#line 1494 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->need_redetect;
+#line 1494 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_) {
+#line 1495 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
+#line 12431 "scanner.c"
 	}
+#line 1496 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->need_redetect = TRUE;
-	g_debug ("scanner.vala:1445: Requesting redetection of scan devices");
+#line 1498 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:1498: Requesting redetection of scan devices");
+#line 1500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = self->priv->request_queue;
+#line 1500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = request_redetect_new ();
+#line 1500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_async_queue_push (_tmp1_, (Request*) _tmp2_);
+#line 12443 "scanner.c"
 }
 
 
 gboolean scanner_is_scanning (Scanner* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_;
+#line 1503 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
+#line 1505 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->scanning;
+#line 1505 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = _tmp0_;
+#line 1505 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
+#line 12458 "scanner.c"
 }
 
 
 static gchar* scanner_get_scan_mode_string (Scanner* self, ScanMode mode) {
 	gchar* result = NULL;
 	ScanMode _tmp0_;
+#line 1508 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, NULL);
+#line 1510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = mode;
+#line 1510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	switch (_tmp0_) {
+#line 1510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_MODE_DEFAULT:
+#line 12473 "scanner.c"
 		{
 			gchar* _tmp1_;
+#line 1513 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp1_ = g_strdup ("ScanMode.DEFAULT");
+#line 1513 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp1_;
+#line 1513 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
+#line 12482 "scanner.c"
 		}
+#line 1510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_MODE_COLOR:
+#line 12486 "scanner.c"
 		{
 			gchar* _tmp2_;
+#line 1515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp2_ = g_strdup ("ScanMode.COLOR");
+#line 1515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp2_;
+#line 1515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
+#line 12495 "scanner.c"
 		}
+#line 1510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_MODE_GRAY:
+#line 12499 "scanner.c"
 		{
 			gchar* _tmp3_;
+#line 1517 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp3_ = g_strdup ("ScanMode.GRAY");
+#line 1517 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp3_;
+#line 1517 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
+#line 12508 "scanner.c"
 		}
+#line 1510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_MODE_LINEART:
+#line 12512 "scanner.c"
 		{
 			gchar* _tmp4_;
+#line 1519 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = g_strdup ("ScanMode.LINEART");
+#line 1519 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp4_;
+#line 1519 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
+#line 12521 "scanner.c"
 		}
 		default:
 		{
 			ScanMode _tmp5_;
 			gchar* _tmp6_ = NULL;
+#line 1521 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp5_ = mode;
+#line 1521 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp6_ = g_strdup_printf ("%d", (gint) _tmp5_);
+#line 1521 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp6_;
+#line 1521 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
+#line 12535 "scanner.c"
 		}
 	}
 }
@@ -8009,45 +12548,77 @@ static gchar* scanner_get_scan_mode_string (Scanner* self, ScanMode mode) {
 static gchar* scanner_get_scan_type_string (Scanner* self, ScanType type) {
 	gchar* result = NULL;
 	ScanType _tmp0_;
+#line 1525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, NULL);
+#line 1527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = type;
+#line 1527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	switch (_tmp0_) {
+#line 1527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_TYPE_SINGLE:
+#line 12552 "scanner.c"
 		{
 			gchar* _tmp1_;
+#line 1530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp1_ = g_strdup ("ScanType.SINGLE");
+#line 1530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp1_;
+#line 1530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
+#line 12561 "scanner.c"
 		}
+#line 1527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_TYPE_ADF_FRONT:
+#line 12565 "scanner.c"
 		{
 			gchar* _tmp2_;
+#line 1532 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp2_ = g_strdup ("ScanType.ADF_FRONT");
+#line 1532 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp2_;
+#line 1532 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
+#line 12574 "scanner.c"
 		}
+#line 1527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_TYPE_ADF_BACK:
+#line 12578 "scanner.c"
 		{
 			gchar* _tmp3_;
+#line 1534 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp3_ = g_strdup ("ScanType.ADF_BACK");
+#line 1534 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp3_;
+#line 1534 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
+#line 12587 "scanner.c"
 		}
+#line 1527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_TYPE_ADF_BOTH:
+#line 12591 "scanner.c"
 		{
 			gchar* _tmp4_;
+#line 1536 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = g_strdup ("ScanType.ADF_BOTH");
+#line 1536 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp4_;
+#line 1536 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
+#line 12600 "scanner.c"
 		}
 		default:
 		{
 			ScanType _tmp5_;
 			gchar* _tmp6_ = NULL;
+#line 1538 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp5_ = type;
+#line 1538 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp6_ = g_strdup_printf ("%d", (gint) _tmp5_);
+#line 1538 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp6_;
+#line 1538 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
+#line 12614 "scanner.c"
 		}
 	}
 }
@@ -8073,107 +12644,215 @@ void scanner_scan (Scanner* self, const gchar* device, ScanOptions* options) {
 	gint _tmp17_;
 	ScanOptions* _tmp18_;
 	gint _tmp19_;
-	RequestStartScan* _tmp20_;
-	RequestStartScan* request;
-	ScanJob* _tmp21_;
-	ScanJob* _tmp22_;
+	ScanOptions* _tmp20_;
+	gint _tmp21_;
+	ScanOptions* _tmp22_;
 	gint _tmp23_;
-	ScanJob* _tmp24_;
-	const gchar* _tmp25_;
-	gchar* _tmp26_;
-	ScanJob* _tmp27_;
-	ScanOptions* _tmp28_;
-	gint _tmp29_;
-	ScanJob* _tmp30_;
-	ScanOptions* _tmp31_;
-	ScanMode _tmp32_;
-	ScanJob* _tmp33_;
-	ScanOptions* _tmp34_;
-	gint _tmp35_;
-	ScanJob* _tmp36_;
-	ScanOptions* _tmp37_;
-	ScanType _tmp38_;
-	ScanJob* _tmp39_;
-	ScanOptions* _tmp40_;
-	gint _tmp41_;
-	ScanJob* _tmp42_;
-	ScanOptions* _tmp43_;
-	gint _tmp44_;
-	GAsyncQueue* _tmp45_;
-	Request* _tmp46_;
+	RequestStartScan* _tmp24_;
+	RequestStartScan* request;
+	ScanJob* _tmp25_;
+	ScanJob* _tmp26_;
+	gint _tmp27_;
+	ScanJob* _tmp28_;
+	const gchar* _tmp29_;
+	gchar* _tmp30_;
+	ScanJob* _tmp31_;
+	ScanOptions* _tmp32_;
+	gint _tmp33_;
+	ScanJob* _tmp34_;
+	ScanOptions* _tmp35_;
+	ScanMode _tmp36_;
+	ScanJob* _tmp37_;
+	ScanOptions* _tmp38_;
+	gint _tmp39_;
+	ScanJob* _tmp40_;
+	ScanOptions* _tmp41_;
+	ScanType _tmp42_;
+	ScanJob* _tmp43_;
+	ScanOptions* _tmp44_;
+	gint _tmp45_;
+	ScanJob* _tmp46_;
+	ScanOptions* _tmp47_;
+	gint _tmp48_;
+	ScanJob* _tmp49_;
+	ScanOptions* _tmp50_;
+	gint _tmp51_;
+	ScanJob* _tmp52_;
+	ScanOptions* _tmp53_;
+	gint _tmp54_;
+	GAsyncQueue* _tmp55_;
+	Request* _tmp56_;
+#line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
+#line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (options != NULL);
+#line 1545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = device;
+#line 1545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ != NULL) {
+#line 12686 "scanner.c"
 		const gchar* _tmp2_;
+#line 1545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp2_ = device;
+#line 1545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp2_;
+#line 12692 "scanner.c"
 	} else {
+#line 1545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = "(null)";
+#line 12696 "scanner.c"
 	}
+#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _tmp0_;
+#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = options;
+#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = _tmp4_->dpi;
+#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = options;
+#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = _tmp6_->scan_mode;
+#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = scanner_get_scan_mode_string (self, _tmp7_);
+#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp9_ = _tmp8_;
+#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = options;
+#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = _tmp10_->depth;
+#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp12_ = options;
+#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp13_ = _tmp12_->type;
+#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp14_ = scanner_get_scan_type_string (self, _tmp13_);
+#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp15_ = _tmp14_;
+#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp16_ = options;
+#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp17_ = _tmp16_->paper_width;
+#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp18_ = options;
+#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp19_ = _tmp18_->paper_height;
-	g_debug ("scanner.vala:1491: Scanner.scan (\"%s\", dpi=%d, scan_mode=%s, depth=%" \
-"d, type=%s, paper_width=%d, paper_height=%d)", _tmp3_, _tmp5_, _tmp9_, _tmp11_, _tmp15_, _tmp17_, _tmp19_);
+#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp20_ = options;
+#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp21_ = _tmp20_->brightness;
+#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp22_ = options;
+#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp23_ = _tmp22_->contrast;
+#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:1544: Scanner.scan (\"%s\", dpi=%d, scan_mode=%s, depth=%" \
+"d, type=%s, paper_width=%d, paper_height=%d, brightness=%d, contrast=%" \
+"d)", _tmp3_, _tmp5_, _tmp9_, _tmp11_, _tmp15_, _tmp17_, _tmp19_, _tmp21_, _tmp23_);
+#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp15_);
+#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp9_);
-	_tmp20_ = request_start_scan_new ();
-	request = _tmp20_;
-	_tmp21_ = scan_job_new ();
+#line 1548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp24_ = request_start_scan_new ();
+#line 1548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	request = _tmp24_;
+#line 1549 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp25_ = scan_job_new ();
+#line 1549 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (request->job);
-	request->job = _tmp21_;
-	_tmp22_ = request->job;
-	_tmp23_ = self->job_id;
-	self->job_id = _tmp23_ + 1;
-	_tmp22_->id = _tmp23_;
-	_tmp24_ = request->job;
-	_tmp25_ = device;
-	_tmp26_ = g_strdup (_tmp25_);
-	_g_free0 (_tmp24_->device);
-	_tmp24_->device = _tmp26_;
-	_tmp27_ = request->job;
-	_tmp28_ = options;
-	_tmp29_ = _tmp28_->dpi;
-	_tmp27_->dpi = (gdouble) _tmp29_;
-	_tmp30_ = request->job;
-	_tmp31_ = options;
-	_tmp32_ = _tmp31_->scan_mode;
-	_tmp30_->scan_mode = _tmp32_;
-	_tmp33_ = request->job;
-	_tmp34_ = options;
-	_tmp35_ = _tmp34_->depth;
-	_tmp33_->depth = _tmp35_;
-	_tmp36_ = request->job;
-	_tmp37_ = options;
-	_tmp38_ = _tmp37_->type;
-	_tmp36_->type = _tmp38_;
-	_tmp39_ = request->job;
-	_tmp40_ = options;
-	_tmp41_ = _tmp40_->paper_width;
-	_tmp39_->page_width = _tmp41_;
-	_tmp42_ = request->job;
-	_tmp43_ = options;
-	_tmp44_ = _tmp43_->paper_height;
-	_tmp42_->page_height = _tmp44_;
-	_tmp45_ = self->priv->request_queue;
-	_tmp46_ = _request_ref0 ((Request*) request);
-	g_async_queue_push (_tmp45_, _tmp46_);
+#line 1549 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	request->job = _tmp25_;
+#line 1550 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp26_ = request->job;
+#line 1550 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp27_ = self->job_id;
+#line 1550 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	self->job_id = _tmp27_ + 1;
+#line 1550 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp26_->id = _tmp27_;
+#line 1551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp28_ = request->job;
+#line 1551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp29_ = device;
+#line 1551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp30_ = g_strdup (_tmp29_);
+#line 1551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_g_free0 (_tmp28_->device);
+#line 1551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp28_->device = _tmp30_;
+#line 1552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp31_ = request->job;
+#line 1552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp32_ = options;
+#line 1552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp33_ = _tmp32_->dpi;
+#line 1552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp31_->dpi = (gdouble) _tmp33_;
+#line 1553 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp34_ = request->job;
+#line 1553 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp35_ = options;
+#line 1553 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp36_ = _tmp35_->scan_mode;
+#line 1553 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp34_->scan_mode = _tmp36_;
+#line 1554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp37_ = request->job;
+#line 1554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp38_ = options;
+#line 1554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp39_ = _tmp38_->depth;
+#line 1554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp37_->depth = _tmp39_;
+#line 1555 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp40_ = request->job;
+#line 1555 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp41_ = options;
+#line 1555 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp42_ = _tmp41_->type;
+#line 1555 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp40_->type = _tmp42_;
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp43_ = request->job;
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp44_ = options;
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp45_ = _tmp44_->paper_width;
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp43_->page_width = _tmp45_;
+#line 1557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp46_ = request->job;
+#line 1557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp47_ = options;
+#line 1557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp48_ = _tmp47_->paper_height;
+#line 1557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp46_->page_height = _tmp48_;
+#line 1558 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp49_ = request->job;
+#line 1558 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp50_ = options;
+#line 1558 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp51_ = _tmp50_->brightness;
+#line 1558 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp49_->brightness = _tmp51_;
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp52_ = request->job;
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp53_ = options;
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp54_ = _tmp53_->contrast;
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp52_->contrast = _tmp54_;
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp55_ = self->priv->request_queue;
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp56_ = _request_ref0 ((Request*) request);
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_async_queue_push (_tmp55_, _tmp56_);
+#line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_request_unref0 (request);
+#line 12846 "scanner.c"
 }
 
 
@@ -8181,12 +12860,19 @@ void scanner_cancel (Scanner* self) {
 	gint _tmp0_;
 	GAsyncQueue* _tmp1_;
 	RequestCancel* _tmp2_;
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
+#line 1565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->job_id;
+#line 1565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->first_job_id = _tmp0_;
+#line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = self->priv->request_queue;
+#line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = request_cancel_new ();
+#line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_async_queue_push (_tmp1_, (Request*) _tmp2_);
+#line 12866 "scanner.c"
 }
 
 
@@ -8194,19 +12880,37 @@ void scanner_free (Scanner* self) {
 	GAsyncQueue* _tmp0_;
 	RequestQuit* _tmp1_;
 	GThread* _tmp2_;
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-	g_debug ("scanner.vala:1515: Stopping scan thread");
+#line 1571 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:1571: Stopping scan thread");
+#line 1573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->request_queue;
+#line 1573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = request_quit_new ();
+#line 1573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_async_queue_push (_tmp0_, (Request*) _tmp1_);
+#line 1575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = self->priv->thread;
+#line 1575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp2_ != NULL) {
+#line 12888 "scanner.c"
 		GThread* _tmp3_;
+#line 1577 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = self->priv->thread;
+#line 1577 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_thread_join (_tmp3_);
+#line 1578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_g_thread_unref0 (self->priv->thread);
+#line 1578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		self->priv->thread = NULL;
+#line 12898 "scanner.c"
 	}
+#line 1581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	sane_exit ();
-	g_debug ("scanner.vala:1523: sane_exit ()");
+#line 1582 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:1582: sane_exit ()");
+#line 12904 "scanner.c"
 }
 
 
@@ -8217,16 +12921,27 @@ static void g_cclosure_user_marshal_VOID__SCAN_PAGE_INFO (GClosure * closure, GV
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (n_param_values == 2);
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data1 = closure->data;
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = param_values->data[0].v_pointer;
+#line 12923 "scanner.c"
 	} else {
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data1 = param_values->data[0].v_pointer;
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = closure->data;
+#line 12929 "scanner.c"
 	}
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback = (GMarshalFunc_VOID__SCAN_PAGE_INFO) (marshal_data ? marshal_data : cc->callback);
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback (data1, value_get_scan_page_info (param_values + 1), data2);
+#line 12935 "scanner.c"
 }
 
 
@@ -8237,16 +12952,27 @@ static void g_cclosure_user_marshal_VOID__SCAN_LINE (GClosure * closure, GValue
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (n_param_values == 2);
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data1 = closure->data;
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = param_values->data[0].v_pointer;
+#line 12954 "scanner.c"
 	} else {
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data1 = param_values->data[0].v_pointer;
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = closure->data;
+#line 12960 "scanner.c"
 	}
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback = (GMarshalFunc_VOID__SCAN_LINE) (marshal_data ? marshal_data : cc->callback);
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback (data1, value_get_scan_line (param_values + 1), data2);
+#line 12966 "scanner.c"
 }
 
 
@@ -8257,162 +12983,271 @@ static void g_cclosure_user_marshal_VOID__INT_STRING (GClosure * closure, GValue
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (n_param_values == 3);
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data1 = closure->data;
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = param_values->data[0].v_pointer;
+#line 12985 "scanner.c"
 	} else {
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data1 = param_values->data[0].v_pointer;
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = closure->data;
+#line 12991 "scanner.c"
 	}
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback = (GMarshalFunc_VOID__INT_STRING) (marshal_data ? marshal_data : cc->callback);
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback (data1, g_value_get_int (param_values + 1), g_value_get_string (param_values + 2), data2);
+#line 12997 "scanner.c"
 }
 
 
 static void value_scanner_init (GValue* value) {
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
+#line 13004 "scanner.c"
 }
 
 
 static void value_scanner_free_value (GValue* value) {
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (value->data[0].v_pointer) {
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_unref (value->data[0].v_pointer);
+#line 13013 "scanner.c"
 	}
 }
 
 
 static void value_scanner_copy_value (const GValue* src_value, GValue* dest_value) {
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (src_value->data[0].v_pointer) {
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = scanner_ref (src_value->data[0].v_pointer);
+#line 13023 "scanner.c"
 	} else {
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
+#line 13027 "scanner.c"
 	}
 }
 
 
 static gpointer value_scanner_peek_pointer (const GValue* value) {
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
+#line 13035 "scanner.c"
 }
 
 
 static gchar* value_scanner_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
+#line 13042 "scanner.c"
 		Scanner* object;
 		object = collect_values[0].v_pointer;
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+#line 13049 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+#line 13053 "scanner.c"
 		}
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scanner_ref (object);
+#line 13057 "scanner.c"
 	} else {
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
+#line 13061 "scanner.c"
 	}
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
+#line 13065 "scanner.c"
 }
 
 
 static gchar* value_scanner_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	Scanner** object_p;
 	object_p = collect_values[0].v_pointer;
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!object_p) {
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
+#line 13076 "scanner.c"
 	}
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
+#line 13082 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
+#line 13086 "scanner.c"
 	} else {
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scanner_ref (value->data[0].v_pointer);
+#line 13090 "scanner.c"
 	}
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
+#line 13094 "scanner.c"
 }
 
 
 GParamSpec* param_spec_scanner (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecScanner* spec;
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_SCANNER), NULL);
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
+#line 13108 "scanner.c"
 }
 
 
 gpointer value_get_scanner (const GValue* value) {
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCANNER), NULL);
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
+#line 13117 "scanner.c"
 }
 
 
 void value_set_scanner (GValue* value, gpointer v_object) {
 	Scanner* old;
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCANNER));
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SCANNER));
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_ref (value->data[0].v_pointer);
+#line 13137 "scanner.c"
 	} else {
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
+#line 13141 "scanner.c"
 	}
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_unref (old);
+#line 13147 "scanner.c"
 	}
 }
 
 
 void value_take_scanner (GValue* value, gpointer v_object) {
 	Scanner* old;
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCANNER));
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SCANNER));
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
+#line 13166 "scanner.c"
 	} else {
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
+#line 13170 "scanner.c"
 	}
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_unref (old);
+#line 13176 "scanner.c"
 	}
 }
 
 
 static void scanner_class_init (ScannerClass * klass) {
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_parent_class = g_type_class_peek_parent (klass);
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	SCANNER_CLASS (klass)->finalize = scanner_finalize;
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_type_class_add_private (klass, sizeof (ScannerPrivate));
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_new ("update_devices", TYPE_SCANNER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_new ("request_authorization", TYPE_SCANNER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_new ("expect_page", TYPE_SCANNER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_new ("got_page_info", TYPE_SCANNER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__SCAN_PAGE_INFO, G_TYPE_NONE, 1, TYPE_SCAN_PAGE_INFO);
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_new ("got_line", TYPE_SCANNER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__SCAN_LINE, G_TYPE_NONE, 1, TYPE_SCAN_LINE);
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_new ("scan_failed", TYPE_SCANNER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__INT_STRING, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_STRING);
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_new ("page_done", TYPE_SCANNER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_new ("document_done", TYPE_SCANNER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_new ("scanning_changed", TYPE_SCANNER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 13206 "scanner.c"
 }
 
 
 static void scanner_instance_init (Scanner * self) {
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv = SCANNER_GET_PRIVATE (self);
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
+#line 13215 "scanner.c"
 }
 
 
 static void scanner_finalize (Scanner* obj) {
 	Scanner * self;
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SCANNER, Scanner);
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_g_thread_unref0 (self->priv->thread);
+#line 217 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_async_queue_unref0 (self->priv->request_queue);
+#line 220 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_async_queue_unref0 (self->priv->notify_queue);
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_async_queue_unref0 (self->priv->authorize_queue);
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->priv->default_device);
+#line 234 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	__g_list_free__scan_job_unref0_0 (self->priv->job_queue);
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->priv->current_device);
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_hash_table_unref0 (self->priv->options);
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer = (g_free (self->priv->buffer), NULL);
+#line 13241 "scanner.c"
 }
 
 
@@ -8433,17 +13268,24 @@ GType scanner_get_type (void) {
 gpointer scanner_ref (gpointer instance) {
 	Scanner* self;
 	self = instance;
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_atomic_int_inc (&self->ref_count);
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
+#line 13266 "scanner.c"
 }
 
 
 void scanner_unref (gpointer instance) {
 	Scanner* self;
 	self = instance;
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		SCANNER_GET_CLASS (self)->finalize (self);
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
+#line 13279 "scanner.c"
 	}
 }
 
diff --git a/src/scanner.vala b/src/scanner.vala
index 722f308..4233337 100644
--- a/src/scanner.vala
+++ b/src/scanner.vala
@@ -80,6 +80,8 @@ public class ScanOptions
     public ScanType type;
     public int paper_width;
     public int paper_height;
+    public int brightness;
+    public int contrast;
 }
 
 private class ScanJob
@@ -92,6 +94,8 @@ private class ScanJob
     public ScanType type;
     public int page_width;
     public int page_height;
+    public int brightness;
+    public int contrast;
 }
 
 private class Request {}
@@ -207,7 +211,7 @@ public class Scanner
     private static Scanner scanner_object = null;
 
     /* Thread communicating with SANE */
-    private unowned Thread<void*> thread;
+    private Thread<void*> thread;
 
     /* Queue of requests from main thread */
     private AsyncQueue<Request> request_queue;
@@ -340,7 +344,7 @@ public class Scanner
             return;
         }
 
-        List<ScanDevice> devices = null;
+        var devices = new List<ScanDevice> ();
         for (var i = 0; device_list[i] != null; i++)
         {
             debug ("Device: name=\"%s\" vendor=\"%s\" model=\"%s\" type=\"%s\"",
@@ -378,6 +382,25 @@ public class Scanner
         notify (new NotifyUpdateDevices ((owned) devices));
     }
 
+    private int scale_int (int source_min, int source_max, Sane.OptionDescriptor option, int value)
+    {
+        var v = value;
+
+        return_val_if_fail (option.type == Sane.ValueType.INT, value);
+
+        if (option.constraint_type == Sane.ConstraintType.RANGE && option.range.max != option.range.min)
+        {
+            v -= source_min;
+            v *= (int) (option.range.max - option.range.min);
+            v /= (source_max - source_min);
+            v += (int) option.range.min;
+            debug ("scale_int: scaling %d [min: %d, max: %d] to %d [min: %d, max: %d]",
+                   value, source_min, source_max, v, (int) option.range.min, (int) option.range.max);
+        }
+
+        return v;
+    }
+
     private bool set_default_option (Sane.Handle handle, Sane.OptionDescriptor option, Sane.Int option_index)
     {
         /* Check if supports automatic option */
@@ -841,6 +864,11 @@ public class Scanner
         {
             /* Pick source */
             option = get_option_by_name (handle, Sane.NAME_SCAN_SOURCE, out index);
+            if (option == null)
+            {
+                 debug ("SCAN_SOURCE not available, trying alternative \"doc-source\"");
+                 option = get_option_by_name (handle, "doc-source", out index); /* Samsung unified driver. LP: #892915 */
+            }
             if (option != null)
             {
                 string[] flatbed_sources =
@@ -860,7 +888,8 @@ public class Scanner
                     Sane.I18N ("Automatic Document Feeder"),
                     "ADF",
                     "Automatic Document Feeder(left aligned)", /* Seen in the proprietary brother3 driver */
-                    "Automatic Document Feeder(centrally aligned)" /* Seen in the proprietary brother3 driver */
+                    "Automatic Document Feeder(centrally aligned)", /* Seen in the proprietary brother3 driver */
+                    "ADF Simplex" /* Samsung unified driver. LP: # 892915 */
                 };
 
                 string[] adf_front_sources =
@@ -878,7 +907,9 @@ public class Scanner
                 string[] adf_duplex_sources =
                 {
                     "ADF Duplex",
-                    Sane.I18N ("ADF Duplex")
+                    Sane.I18N ("ADF Duplex"),
+                    "ADF Duplex - Long-Edge Binding", /* Samsung unified driver. LP: # 892915 */
+                    "ADF Duplex - Short-Edge Binding"
                 };
 
                 switch (job.type)
@@ -915,7 +946,8 @@ public class Scanner
                 {
                     Sane.VALUE_SCAN_MODE_COLOR,
                     "Color",
-                    "24bit Color" /* Seen in the proprietary brother3 driver */
+                    "24bit Color", /* Seen in the proprietary brother3 driver */
+                    "Color - 16 Million Colors" /* Samsung unified driver. LP: 892915 */
                 };
                 string[] gray_scan_modes =
                 {
@@ -923,7 +955,8 @@ public class Scanner
                     "Gray",
                     "Grayscale",
                     Sane.I18N ("Grayscale"),
-                    "True Gray" /* Seen in the proprietary brother3 driver */
+                    "True Gray", /* Seen in the proprietary brother3 driver */
+                    "Grayscale - 256 Levels"  /* Samsung unified driver. LP: 892915 */
                 };
                 string[] lineart_scan_modes =
                 {
@@ -940,7 +973,9 @@ public class Scanner
                     "Gray",
                     "Grayscale",
                     Sane.I18N ("Grayscale"),
-                    "True Gray" /* Seen in the proprietary brother3 driver */
+                    "True Gray", /* Seen in the proprietary brother3 driver */
+                    "Black and White - Line Art",  /* Samsung unified driver. LP: 892915 */
+                    "Black and White - Halftone"
                 };
 
                 switch (job.scan_mode)
@@ -1060,6 +1095,24 @@ public class Scanner
                         set_int_option (handle, option, index, job.page_height / 10, null);
                 }
             }
+            option = get_option_by_name (handle, Sane.NAME_BRIGHTNESS, out index);
+            if (option != null)
+            {
+                if (job.brightness != 0)
+                {
+                    var brightness = scale_int (-100, 100, option, job.brightness);
+                    set_int_option (handle, option, index, brightness, null);
+                }
+            }
+            option = get_option_by_name (handle, Sane.NAME_CONTRAST, out index);
+            if (option != null)
+            {
+                if (job.contrast != 0)
+                {
+                    var contrast = scale_int (-100, 100, option, job.contrast);
+                    set_int_option (handle, option, index, contrast, null);
+                }
+            }
 
             /* Test scanner options (hoping will not effect other scanners...) */
             if (current_device == "test")
@@ -1428,7 +1481,7 @@ public class Scanner
     {
         try
         {
-            thread = Thread.create<void*> (scan_thread, true);
+            thread = new Thread<void*>.try ("scan-thread", scan_thread);
         }
         catch (Error e)
         {
@@ -1488,9 +1541,10 @@ public class Scanner
 
     public void scan (string? device, ScanOptions options)
     {
-        debug ("Scanner.scan (\"%s\", dpi=%d, scan_mode=%s, depth=%d, type=%s, paper_width=%d, paper_height=%d)",
+        debug ("Scanner.scan (\"%s\", dpi=%d, scan_mode=%s, depth=%d, type=%s, paper_width=%d, paper_height=%d, brightness=%d, contrast=%d)",
                device != null ? device : "(null)", options.dpi, get_scan_mode_string (options.scan_mode), options.depth,
-               get_scan_type_string (options.type), options.paper_width, options.paper_height);
+               get_scan_type_string (options.type), options.paper_width, options.paper_height,
+               options.brightness, options.contrast);
         var request = new RequestStartScan ();
         request.job = new ScanJob ();
         request.job.id = job_id++;
@@ -1501,6 +1555,8 @@ public class Scanner
         request.job.type = options.type;
         request.job.page_width = options.paper_width;
         request.job.page_height = options.paper_height;
+        request.job.brightness = options.brightness;
+        request.job.contrast = options.contrast;
         request_queue.push (request);
     }
 
@@ -1517,8 +1573,11 @@ public class Scanner
         request_queue.push (new RequestQuit ());
 
         if (thread != null)
+        {
             thread.join ();
-
+            thread = null;
+        }
+        
         Sane.exit ();
         debug ("sane_exit ()");
     }
diff --git a/src/simple-scan.c b/src/simple-scan.c
index ee347c7..b75f90d 100644
--- a/src/simple-scan.c
+++ b/src/simple-scan.c
@@ -1,4 +1,4 @@
-/* simple-scan.c generated by valac 0.18.1, the Vala compiler
+/* simple-scan.c generated by valac 0.20.1, the Vala compiler
  * generated from simple-scan.vala, do not modify */
 
 /*
@@ -28,7 +28,6 @@
 #include <glib/gstdio.h>
 #include <unistd.h>
 #include <locale.h>
-#include "config.h"
 
 
 #define TYPE_SIMPLE_SCAN (simple_scan_get_type ())
@@ -226,6 +225,8 @@ struct _ScanOptions {
 	ScanType type;
 	gint paper_width;
 	gint paper_height;
+	gint brightness;
+	gint contrast;
 };
 
 struct _ScanOptionsClass {
@@ -296,8 +297,8 @@ static void simple_scan_scan_cb (SimpleScan* self, UserInterface* ui, const gcha
 static void _simple_scan_scan_cb_user_interface_start_scan (UserInterface* _sender, const gchar* device, ScanOptions* options, gpointer self);
 static void simple_scan_cancel_cb (SimpleScan* self, UserInterface* ui);
 static void _simple_scan_cancel_cb_user_interface_stop_scan (UserInterface* _sender, gpointer self);
-static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gchar* profile);
-static void _simple_scan_email_cb_user_interface_email (UserInterface* _sender, const gchar* profile, gpointer self);
+static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gchar* profile, gint quality);
+static void _simple_scan_email_cb_user_interface_email (UserInterface* _sender, const gchar* profile, gint quality, gpointer self);
 Scanner* scanner_get_instance (void);
 static void simple_scan_update_scan_devices_cb (SimpleScan* self, Scanner* scanner, GList* devices);
 static void _simple_scan_update_scan_devices_cb_scanner_update_devices (Scanner* _sender, GList* devices, gpointer self);
@@ -386,9 +387,9 @@ void scanner_scan (Scanner* self, const gchar* device, ScanOptions* options);
 void scanner_cancel (Scanner* self);
 static gchar* simple_scan_get_temporary_filename (SimpleScan* self, const gchar* prefix, const gchar* extension);
 void user_interface_show_progress_dialog (UserInterface* self);
-void book_save (Book* self, const gchar* type, GFile* file, GError** error);
+void book_save (Book* self, const gchar* type, gint quality, GFile* file, GError** error);
 void user_interface_hide_progress_dialog (UserInterface* self);
-void page_save (Page* self, const gchar* type, GFile* file, GError** error);
+void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError** error);
 static void simple_scan_log_cb (const gchar* log_domain, GLogLevelFlags log_level, const gchar* message);
 void scanner_redetect (Scanner* self);
 static void simple_scan_fix_pdf (const gchar* filename, GError** error);
@@ -403,7 +404,9 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify
 const GOptionEntry SIMPLE_SCAN_options[4] = {{"version", 'v', 0, G_OPTION_ARG_NONE, &simple_scan_show_version, "Show release version", NULL}, {"debug", 'd', 0, G_OPTION_ARG_NONE, &simple_scan_debug_enabled, "Print debugging messages", NULL}, {"fix-pdf", (gchar) 0, 0, G_OPTION_ARG_STRING, &simple_scan_fix_pdf_filename, "Fix PDF files generated with older versions of Simple Scan", "FILENAME..."}, {NULL}};
 
 static gpointer _scan_device_ref0 (gpointer self) {
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return self ? scan_device_ref (self) : NULL;
+#line 410 "simple-scan.c"
 }
 
 
@@ -411,93 +414,133 @@ SimpleScan* simple_scan_construct (GType object_type, ScanDevice* device) {
 	SimpleScan * self = NULL;
 	ScanDevice* _tmp0_;
 	ScanDevice* _tmp1_;
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self = (SimpleScan*) g_object_new (object_type, NULL);
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = device;
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = _scan_device_ref0 (_tmp0_);
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_scan_device_unref0 (self->priv->default_device);
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self->priv->default_device = _tmp1_;
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return self;
+#line 430 "simple-scan.c"
 }
 
 
 SimpleScan* simple_scan_new (ScanDevice* device) {
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return simple_scan_construct (TYPE_SIMPLE_SCAN, device);
+#line 437 "simple-scan.c"
 }
 
 
 static void _simple_scan_scan_cb_user_interface_start_scan (UserInterface* _sender, const gchar* device, ScanOptions* options, gpointer self) {
+#line 50 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_scan_cb (self, _sender, device, options);
+#line 444 "simple-scan.c"
 }
 
 
 static void _simple_scan_cancel_cb_user_interface_stop_scan (UserInterface* _sender, gpointer self) {
+#line 51 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_cancel_cb (self, _sender);
+#line 451 "simple-scan.c"
 }
 
 
-static void _simple_scan_email_cb_user_interface_email (UserInterface* _sender, const gchar* profile, gpointer self) {
-	simple_scan_email_cb (self, _sender, profile);
+static void _simple_scan_email_cb_user_interface_email (UserInterface* _sender, const gchar* profile, gint quality, gpointer self) {
+#line 52 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	simple_scan_email_cb (self, _sender, profile, quality);
+#line 458 "simple-scan.c"
 }
 
 
 static void _simple_scan_update_scan_devices_cb_scanner_update_devices (Scanner* _sender, GList* devices, gpointer self) {
+#line 55 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_update_scan_devices_cb (self, _sender, devices);
+#line 465 "simple-scan.c"
 }
 
 
 static void _simple_scan_authorize_cb_scanner_request_authorization (Scanner* _sender, const gchar* resource, gpointer self) {
+#line 56 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_authorize_cb (self, _sender, resource);
+#line 472 "simple-scan.c"
 }
 
 
 static void _simple_scan_scanner_new_page_cb_scanner_expect_page (Scanner* _sender, gpointer self) {
+#line 57 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_scanner_new_page_cb (self, _sender);
+#line 479 "simple-scan.c"
 }
 
 
 static void _simple_scan_scanner_page_info_cb_scanner_got_page_info (Scanner* _sender, ScanPageInfo* info, gpointer self) {
+#line 58 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_scanner_page_info_cb (self, _sender, info);
+#line 486 "simple-scan.c"
 }
 
 
 static void _simple_scan_scanner_line_cb_scanner_got_line (Scanner* _sender, ScanLine* line, gpointer self) {
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_scanner_line_cb (self, _sender, line);
+#line 493 "simple-scan.c"
 }
 
 
 static void _simple_scan_scanner_page_done_cb_scanner_page_done (Scanner* _sender, gpointer self) {
+#line 60 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_scanner_page_done_cb (self, _sender);
+#line 500 "simple-scan.c"
 }
 
 
 static void _simple_scan_scanner_document_done_cb_scanner_document_done (Scanner* _sender, gpointer self) {
+#line 61 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_scanner_document_done_cb (self, _sender);
+#line 507 "simple-scan.c"
 }
 
 
 static void _simple_scan_scanner_failed_cb_scanner_scan_failed (Scanner* _sender, gint error_code, const gchar* error_string, gpointer self) {
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_scanner_failed_cb (self, _sender, error_code, error_string);
+#line 514 "simple-scan.c"
 }
 
 
 static void _simple_scan_scanner_scanning_changed_cb_scanner_scanning_changed (Scanner* _sender, gpointer self) {
+#line 63 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_scanner_scanning_changed_cb (self, _sender);
+#line 521 "simple-scan.c"
 }
 
 
 static void _simple_scan_on_uevent_g_udev_client_uevent (GUdevClient* _sender, const gchar* action, GUdevDevice* device, gpointer self) {
+#line 67 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_on_uevent (self, _sender, action, device);
+#line 528 "simple-scan.c"
 }
 
 
 static void _scan_device_unref0_ (gpointer var) {
+#line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	(var == NULL) ? NULL : (var = (scan_device_unref (var), NULL));
+#line 535 "simple-scan.c"
 }
 
 
 static void _g_list_free__scan_device_unref0_ (GList* self) {
+#line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_list_foreach (self, (GFunc) _scan_device_unref0_, NULL);
+#line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_list_free (self);
+#line 544 "simple-scan.c"
 }
 
 
@@ -529,58 +572,111 @@ static void simple_scan_real_startup (GApplication* base) {
 	GUdevClient* _tmp19_;
 	GUdevClient* _tmp20_;
 	ScanDevice* _tmp21_;
+#line 44 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self = (SimpleScan*) base;
+#line 46 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	G_APPLICATION_CLASS (simple_scan_parent_class)->startup ((GApplication*) G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_APPLICATION, GtkApplication));
+#line 48 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = user_interface_new ();
+#line 48 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_user_interface_unref0 (self->priv->ui);
+#line 48 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self->priv->ui = _tmp0_;
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = self->priv->ui;
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp2_ = user_interface_get_book (_tmp1_);
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_book_unref0 (self->priv->book);
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self->priv->book = _tmp2_;
+#line 50 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp3_ = self->priv->ui;
+#line 50 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_signal_connect_object (_tmp3_, "start-scan", (GCallback) _simple_scan_scan_cb_user_interface_start_scan, self, 0);
+#line 51 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp4_ = self->priv->ui;
+#line 51 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_signal_connect_object (_tmp4_, "stop-scan", (GCallback) _simple_scan_cancel_cb_user_interface_stop_scan, self, 0);
+#line 52 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp5_ = self->priv->ui;
+#line 52 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_signal_connect_object (_tmp5_, "email", (GCallback) _simple_scan_email_cb_user_interface_email, self, 0);
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp6_ = scanner_get_instance ();
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_scanner_unref0 (self->priv->scanner);
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self->priv->scanner = _tmp6_;
+#line 55 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp7_ = self->priv->scanner;
+#line 55 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_signal_connect_object (_tmp7_, "update-devices", (GCallback) _simple_scan_update_scan_devices_cb_scanner_update_devices, self, 0);
+#line 56 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp8_ = self->priv->scanner;
+#line 56 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_signal_connect_object (_tmp8_, "request-authorization", (GCallback) _simple_scan_authorize_cb_scanner_request_authorization, self, 0);
+#line 57 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp9_ = self->priv->scanner;
+#line 57 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_signal_connect_object (_tmp9_, "expect-page", (GCallback) _simple_scan_scanner_new_page_cb_scanner_expect_page, self, 0);
+#line 58 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp10_ = self->priv->scanner;
+#line 58 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_signal_connect_object (_tmp10_, "got-page-info", (GCallback) _simple_scan_scanner_page_info_cb_scanner_got_page_info, self, 0);
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp11_ = self->priv->scanner;
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_signal_connect_object (_tmp11_, "got-line", (GCallback) _simple_scan_scanner_line_cb_scanner_got_line, self, 0);
+#line 60 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp12_ = self->priv->scanner;
+#line 60 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_signal_connect_object (_tmp12_, "page-done", (GCallback) _simple_scan_scanner_page_done_cb_scanner_page_done, self, 0);
+#line 61 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp13_ = self->priv->scanner;
+#line 61 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_signal_connect_object (_tmp13_, "document-done", (GCallback) _simple_scan_scanner_document_done_cb_scanner_document_done, self, 0);
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp14_ = self->priv->scanner;
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_signal_connect_object (_tmp14_, "scan-failed", (GCallback) _simple_scan_scanner_failed_cb_scanner_scan_failed, self, 0);
+#line 63 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp15_ = self->priv->scanner;
+#line 63 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_signal_connect_object (_tmp15_, "scanning-changed", (GCallback) _simple_scan_scanner_scanning_changed_cb_scanner_scanning_changed, self, 0);
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp16_ = g_strdup ("usb");
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp17_ = g_new0 (gchar*, 2 + 1);
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp17_[0] = _tmp16_;
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp17_[1] = NULL;
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	subsystems = _tmp17_;
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	subsystems_length1 = 2;
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_subsystems_size_ = subsystems_length1;
+#line 66 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp18_ = subsystems;
+#line 66 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp18__length1 = subsystems_length1;
+#line 66 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp19_ = g_udev_client_new (_tmp18_);
+#line 66 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_object_unref0 (self->priv->udev_client);
+#line 66 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self->priv->udev_client = _tmp19_;
+#line 67 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp20_ = self->priv->udev_client;
+#line 67 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_signal_connect_object (_tmp20_, "uevent", (GCallback) _simple_scan_on_uevent_g_udev_client_uevent, self, 0);
+#line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp21_ = self->priv->default_device;
+#line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp21_ != NULL) {
+#line 680 "simple-scan.c"
 		GList* device_list;
 		ScanDevice* _tmp22_;
 		ScanDevice* _tmp23_;
@@ -589,20 +685,35 @@ static void simple_scan_real_startup (GApplication* base) {
 		UserInterface* _tmp26_;
 		ScanDevice* _tmp27_;
 		const gchar* _tmp28_;
+#line 71 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		device_list = NULL;
+#line 73 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp22_ = self->priv->default_device;
+#line 73 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp23_ = _scan_device_ref0 (_tmp22_);
+#line 73 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		device_list = g_list_append (device_list, _tmp23_);
+#line 74 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp24_ = self->priv->ui;
+#line 74 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp25_ = device_list;
+#line 74 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		user_interface_set_scan_devices (_tmp24_, _tmp25_);
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp26_ = self->priv->ui;
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp27_ = self->priv->default_device;
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp28_ = _tmp27_->name;
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		user_interface_set_selected_device (_tmp26_, _tmp28_);
+#line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		__g_list_free__scan_device_unref0_0 (device_list);
+#line 713 "simple-scan.c"
 	}
+#line 44 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	subsystems = (_vala_array_free (subsystems, subsystems_length1, (GDestroyNotify) g_free), NULL);
+#line 717 "simple-scan.c"
 }
 
 
@@ -610,28 +721,46 @@ static void simple_scan_real_activate (GApplication* base) {
 	SimpleScan * self;
 	UserInterface* _tmp0_;
 	Scanner* _tmp1_;
+#line 79 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self = (SimpleScan*) base;
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	G_APPLICATION_CLASS (simple_scan_parent_class)->activate ((GApplication*) G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_APPLICATION, GtkApplication));
+#line 82 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = self->priv->ui;
+#line 82 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	user_interface_start (_tmp0_);
+#line 83 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = self->priv->scanner;
+#line 83 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	scanner_start (_tmp1_);
+#line 737 "simple-scan.c"
 }
 
 
 static void simple_scan_real_shutdown (GApplication* base) {
 	SimpleScan * self;
 	Scanner* _tmp0_;
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self = (SimpleScan*) base;
+#line 88 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	G_APPLICATION_CLASS (simple_scan_parent_class)->shutdown ((GApplication*) G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_APPLICATION, GtkApplication));
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_book_unref0 (self->priv->book);
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self->priv->book = NULL;
+#line 90 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_user_interface_unref0 (self->priv->ui);
+#line 90 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self->priv->ui = NULL;
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_object_unref0 (self->priv->udev_client);
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self->priv->udev_client = NULL;
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = self->priv->scanner;
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	scanner_free (_tmp0_);
+#line 764 "simple-scan.c"
 }
 
 
@@ -644,55 +773,93 @@ static void simple_scan_update_scan_devices_cb (SimpleScan* self, Scanner* scann
 	guint _tmp11_ = 0U;
 	UserInterface* _tmp12_;
 	GList* _tmp13_;
+#line 95 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
+#line 95 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (scanner != NULL);
+#line 97 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = devices;
+#line 97 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = g_list_copy (_tmp0_);
+#line 97 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	devices_copy = _tmp1_;
+#line 100 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp2_ = self->priv->default_device;
+#line 100 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp2_ != NULL) {
+#line 791 "simple-scan.c"
 		gboolean default_in_list;
 		GList* _tmp3_;
 		gboolean _tmp8_;
+#line 102 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		default_in_list = FALSE;
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp3_ = devices_copy;
+#line 799 "simple-scan.c"
 		{
 			GList* device_collection = NULL;
 			GList* device_it = NULL;
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			device_collection = _tmp3_;
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			for (device_it = device_collection; device_it != NULL; device_it = device_it->next) {
+#line 807 "simple-scan.c"
 				ScanDevice* device = NULL;
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				device = (ScanDevice*) device_it->data;
+#line 811 "simple-scan.c"
 				{
 					ScanDevice* _tmp4_;
 					const gchar* _tmp5_;
 					ScanDevice* _tmp6_;
 					const gchar* _tmp7_;
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp4_ = device;
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp5_ = _tmp4_->name;
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp6_ = self->priv->default_device;
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp7_ = _tmp6_->name;
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					if (g_strcmp0 (_tmp5_, _tmp7_) == 0) {
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						default_in_list = TRUE;
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						break;
+#line 831 "simple-scan.c"
 					}
 				}
 			}
 		}
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp8_ = default_in_list;
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (!_tmp8_) {
+#line 840 "simple-scan.c"
 			ScanDevice* _tmp9_;
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp9_ = self->priv->default_device;
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			devices_copy = g_list_prepend (devices_copy, _tmp9_);
+#line 846 "simple-scan.c"
 		}
 	}
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp10_ = devices_copy;
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp11_ = g_list_length (_tmp10_);
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self->priv->have_devices = _tmp11_ > ((guint) 0);
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp12_ = self->priv->ui;
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp13_ = devices_copy;
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	user_interface_set_scan_devices (_tmp12_, _tmp13_);
+#line 95 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_list_free0 (devices_copy);
+#line 863 "simple-scan.c"
 }
 
 
@@ -704,20 +871,35 @@ static void simple_scan_authorize_cb (SimpleScan* self, Scanner* scanner, const
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
 	Scanner* _tmp4_;
+#line 120 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
+#line 120 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (scanner != NULL);
+#line 120 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (resource != NULL);
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = self->priv->ui;
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = resource;
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	user_interface_authorize (_tmp0_, _tmp1_, &_tmp2_, &_tmp3_);
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (username);
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	username = _tmp2_;
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (password);
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	password = _tmp3_;
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp4_ = scanner;
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	scanner_authorize (_tmp4_, username, password);
+#line 120 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (password);
+#line 120 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (username);
+#line 903 "simple-scan.c"
 }
 
 
@@ -750,45 +932,82 @@ static Page* simple_scan_append_page (SimpleScan* self) {
 	UserInterface* _tmp45_;
 	Page* _tmp46_;
 	Page* _tmp47_;
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_val_if_fail (self != NULL, NULL);
+#line 130 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = self->priv->book;
+#line 130 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = book_get_page (_tmp0_, -1);
+#line 130 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	page = _tmp1_;
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp3_ = page;
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp3_ != NULL) {
+#line 948 "simple-scan.c"
 		Page* _tmp4_;
 		gboolean _tmp5_ = FALSE;
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp4_ = page;
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp5_ = page_has_data (_tmp4_);
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp2_ = !_tmp5_;
+#line 957 "simple-scan.c"
 	} else {
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp2_ = FALSE;
+#line 961 "simple-scan.c"
 	}
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp6_ = _tmp2_;
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp6_) {
+#line 967 "simple-scan.c"
 		UserInterface* _tmp7_;
 		Page* _tmp8_;
 		Page* _tmp9_;
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp7_ = self->priv->ui;
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp8_ = page;
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		user_interface_set_selected_page (_tmp7_, _tmp8_);
+#line 134 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp9_ = page;
+#line 134 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		page_start (_tmp9_);
+#line 135 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = page;
+#line 135 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
+#line 985 "simple-scan.c"
 	}
+#line 139 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	scan_direction = SCAN_DIRECTION_TOP_TO_BOTTOM;
+#line 140 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	do_crop = FALSE;
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	named_crop = NULL;
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	width = 100;
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	height = 100;
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	dpi = 100;
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	cx = 0;
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	cy = 0;
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	cw = 0;
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	ch = 0;
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp10_ = page;
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp10_ != NULL) {
+#line 1011 "simple-scan.c"
 		Page* _tmp11_;
 		ScanDirection _tmp12_ = 0;
 		Page* _tmp13_;
@@ -800,23 +1019,41 @@ static Page* simple_scan_append_page (SimpleScan* self) {
 		Page* _tmp19_;
 		gboolean _tmp20_ = FALSE;
 		gboolean _tmp21_;
+#line 145 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp11_ = page;
+#line 145 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp12_ = page_get_scan_direction (_tmp11_);
+#line 145 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		scan_direction = _tmp12_;
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp13_ = page;
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp14_ = page_get_width (_tmp13_);
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		width = _tmp14_;
+#line 147 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp15_ = page;
+#line 147 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp16_ = page_get_height (_tmp15_);
+#line 147 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		height = _tmp16_;
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp17_ = page;
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp18_ = page_get_dpi (_tmp17_);
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		dpi = _tmp18_;
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp19_ = page;
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp20_ = page_has_crop (_tmp19_);
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		do_crop = _tmp20_;
+#line 151 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp21_ = do_crop;
+#line 151 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (_tmp21_) {
+#line 1057 "simple-scan.c"
 			Page* _tmp22_;
 			gchar* _tmp23_ = NULL;
 			Page* _tmp24_;
@@ -824,72 +1061,126 @@ static Page* simple_scan_append_page (SimpleScan* self) {
 			gint _tmp26_ = 0;
 			gint _tmp27_ = 0;
 			gint _tmp28_ = 0;
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp22_ = page;
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp23_ = page_get_named_crop (_tmp22_);
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_free0 (named_crop);
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			named_crop = _tmp23_;
+#line 154 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp24_ = page;
+#line 154 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			page_get_crop (_tmp24_, &_tmp25_, &_tmp26_, &_tmp27_, &_tmp28_);
+#line 154 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			cx = _tmp25_;
+#line 154 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			cy = _tmp26_;
+#line 154 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			cw = _tmp27_;
+#line 154 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			ch = _tmp28_;
+#line 1085 "simple-scan.c"
 		}
 	}
+#line 158 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp29_ = self->priv->book;
+#line 158 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp30_ = width;
+#line 158 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp31_ = height;
+#line 158 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp32_ = dpi;
+#line 158 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp33_ = scan_direction;
+#line 158 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp34_ = book_append_page (_tmp29_, _tmp30_, _tmp31_, _tmp32_, _tmp33_);
+#line 158 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_page_unref0 (page);
+#line 158 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	page = _tmp34_;
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp35_ = do_crop;
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp35_) {
+#line 1108 "simple-scan.c"
 		const gchar* _tmp36_;
 		Page* _tmp42_;
 		gint _tmp43_;
 		gint _tmp44_;
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp36_ = named_crop;
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (_tmp36_ != NULL) {
+#line 1117 "simple-scan.c"
 			Page* _tmp37_;
 			const gchar* _tmp38_;
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp37_ = page;
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp38_ = named_crop;
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			page_set_named_crop (_tmp37_, _tmp38_);
+#line 1126 "simple-scan.c"
 		} else {
 			Page* _tmp39_;
 			gint _tmp40_;
 			gint _tmp41_;
+#line 166 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp39_ = page;
+#line 166 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp40_ = cw;
+#line 166 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp41_ = ch;
+#line 166 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			page_set_custom_crop (_tmp39_, _tmp40_, _tmp41_);
+#line 1139 "simple-scan.c"
 		}
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp42_ = page;
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp43_ = cx;
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp44_ = cy;
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		page_move_crop (_tmp42_, _tmp43_, _tmp44_);
+#line 1149 "simple-scan.c"
 	}
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp45_ = self->priv->ui;
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp46_ = page;
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	user_interface_set_selected_page (_tmp45_, _tmp46_);
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp47_ = page;
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	page_start (_tmp47_);
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	result = page;
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (named_crop);
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return result;
+#line 1167 "simple-scan.c"
 }
 
 
 static void simple_scan_scanner_new_page_cb (SimpleScan* self, Scanner* scanner) {
 	Page* _tmp0_ = NULL;
 	Page* _tmp1_;
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (scanner != NULL);
+#line 177 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = simple_scan_append_page (self);
+#line 177 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = _tmp0_;
+#line 177 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_page_unref0 (_tmp1_);
+#line 1184 "simple-scan.c"
 }
 
 
@@ -918,212 +1209,371 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
 	const gchar* _tmp36_;
 	gchar* _tmp37_;
 	GError * _inner_error_ = NULL;
+#line 180 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_val_if_fail (self != NULL, NULL);
+#line 180 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_val_if_fail (device_name != NULL, NULL);
+#line 183 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = device_name;
+#line 183 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = g_strdup_printf ("sane:%s", _tmp0_);
+#line 183 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	device_id = _tmp1_;
+#line 184 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp2_ = device_name;
+#line 184 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_debug ("simple-scan.vala:184: Getting color profile for device %s", _tmp2_);
+#line 186 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp3_ = cd_client_new ();
+#line 186 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	client = _tmp3_;
+#line 1231 "simple-scan.c"
 	{
 		CdClient* _tmp4_;
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp4_ = client;
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		cd_client_connect_sync (_tmp4_, NULL, &_inner_error_);
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (_inner_error_ != NULL) {
-			goto __catch3_g_error;
+#line 1240 "simple-scan.c"
+			goto __catch4_g_error;
 		}
 	}
-	goto __finally3;
-	__catch3_g_error:
+	goto __finally4;
+	__catch4_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp5_;
 		const gchar* _tmp6_;
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		e = _inner_error_;
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_inner_error_ = NULL;
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp5_ = e;
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp6_ = _tmp5_->message;
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_debug ("simple-scan.vala:193: Failed to connect to colord: %s", _tmp6_);
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = NULL;
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_error_free0 (e);
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (client);
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (device_id);
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
+#line 1270 "simple-scan.c"
 	}
-	__finally3:
+	__finally4:
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_inner_error_ != NULL) {
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (client);
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (device_id);
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_clear_error (&_inner_error_);
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return NULL;
+#line 1285 "simple-scan.c"
 	}
 	{
 		CdClient* _tmp7_;
 		const gchar* _tmp8_;
 		CdDevice* _tmp9_ = NULL;
 		CdDevice* _tmp10_;
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp7_ = client;
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp8_ = device_id;
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp9_ = cd_client_find_device_by_property_sync (_tmp7_, CD_DEVICE_PROPERTY_SERIAL, _tmp8_, NULL, &_inner_error_);
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp10_ = _tmp9_;
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (_inner_error_ != NULL) {
-			goto __catch4_g_error;
+#line 1302 "simple-scan.c"
+			goto __catch5_g_error;
 		}
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (device);
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		device = _tmp10_;
+#line 1309 "simple-scan.c"
 	}
-	goto __finally4;
-	__catch4_g_error:
+	goto __finally5;
+	__catch5_g_error:
 	{
 		GError* e = NULL;
 		const gchar* _tmp11_;
 		GError* _tmp12_;
 		const gchar* _tmp13_;
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		e = _inner_error_;
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_inner_error_ = NULL;
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp11_ = device_name;
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp12_ = e;
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp13_ = _tmp12_->message;
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_debug ("simple-scan.vala:204: Unable to find colord device %s: %s", _tmp11_, _tmp13_);
+#line 205 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = NULL;
+#line 205 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_error_free0 (e);
+#line 205 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (device);
+#line 205 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (client);
+#line 205 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (device_id);
+#line 205 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
+#line 1342 "simple-scan.c"
 	}
-	__finally4:
+	__finally5:
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_inner_error_ != NULL) {
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (device);
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (client);
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (device_id);
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_clear_error (&_inner_error_);
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return NULL;
+#line 1359 "simple-scan.c"
 	}
 	{
 		CdDevice* _tmp14_;
+#line 210 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp14_ = device;
+#line 210 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		cd_device_connect_sync (_tmp14_, NULL, &_inner_error_);
+#line 210 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (_inner_error_ != NULL) {
-			goto __catch5_g_error;
+#line 1369 "simple-scan.c"
+			goto __catch6_g_error;
 		}
 	}
-	goto __finally5;
-	__catch5_g_error:
+	goto __finally6;
+	__catch6_g_error:
 	{
 		GError* e = NULL;
 		const gchar* _tmp15_;
 		GError* _tmp16_;
 		const gchar* _tmp17_;
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		e = _inner_error_;
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_inner_error_ = NULL;
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp15_ = device_name;
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp16_ = e;
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp17_ = _tmp16_->message;
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_debug ("simple-scan.vala:214: Failed to get properties from the device %s: %s", _tmp15_, _tmp17_);
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = NULL;
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_error_free0 (e);
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (device);
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (client);
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (device_id);
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
+#line 1404 "simple-scan.c"
 	}
-	__finally5:
+	__finally6:
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_inner_error_ != NULL) {
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (device);
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (client);
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (device_id);
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_clear_error (&_inner_error_);
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return NULL;
+#line 1421 "simple-scan.c"
 	}
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp18_ = device;
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp19_ = cd_device_get_default_profile (_tmp18_);
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	profile = _tmp19_;
+#line 219 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp20_ = profile;
+#line 219 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp20_ == NULL) {
+#line 1433 "simple-scan.c"
 		const gchar* _tmp21_;
+#line 221 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp21_ = device_name;
+#line 221 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_debug ("simple-scan.vala:221: No default color profile for device: %s", _tmp21_);
+#line 222 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = NULL;
+#line 222 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (profile);
+#line 222 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (device);
+#line 222 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (client);
+#line 222 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (device_id);
+#line 222 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
+#line 1451 "simple-scan.c"
 	}
 	{
 		CdProfile* _tmp22_;
+#line 227 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp22_ = profile;
+#line 227 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		cd_profile_connect_sync (_tmp22_, NULL, &_inner_error_);
+#line 227 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (_inner_error_ != NULL) {
-			goto __catch6_g_error;
+#line 1461 "simple-scan.c"
+			goto __catch7_g_error;
 		}
 	}
-	goto __finally6;
-	__catch6_g_error:
+	goto __finally7;
+	__catch7_g_error:
 	{
 		GError* e = NULL;
 		const gchar* _tmp23_;
 		GError* _tmp24_;
 		const gchar* _tmp25_;
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		e = _inner_error_;
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_inner_error_ = NULL;
+#line 231 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp23_ = device_name;
+#line 231 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp24_ = e;
+#line 231 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp25_ = _tmp24_->message;
+#line 231 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_debug ("simple-scan.vala:231: Failed to get properties from the profile %s: %s", _tmp23_, _tmp25_);
+#line 232 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = NULL;
+#line 232 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_error_free0 (e);
+#line 232 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (profile);
+#line 232 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (device);
+#line 232 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (client);
+#line 232 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (device_id);
+#line 232 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
+#line 1498 "simple-scan.c"
 	}
-	__finally6:
+	__finally7:
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_inner_error_ != NULL) {
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (profile);
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (device);
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (client);
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (device_id);
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_clear_error (&_inner_error_);
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return NULL;
+#line 1517 "simple-scan.c"
 	}
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp26_ = profile;
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp27_ = cd_profile_get_filename (_tmp26_);
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp28_ = _tmp27_;
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp28_ == NULL) {
+#line 1527 "simple-scan.c"
 		const gchar* _tmp29_;
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp29_ = device_name;
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_debug ("simple-scan.vala:237: No icc color profile for the device %s", _tmp29_);
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = NULL;
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (profile);
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (device);
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (client);
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (device_id);
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
+#line 1545 "simple-scan.c"
 	}
+#line 241 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp30_ = profile;
+#line 241 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp31_ = cd_profile_get_filename (_tmp30_);
+#line 241 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp32_ = _tmp31_;
+#line 241 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp33_ = device_name;
+#line 241 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_debug ("simple-scan.vala:241: Using color profile %s for device %s", _tmp32_, _tmp33_);
+#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp34_ = profile;
+#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp35_ = cd_profile_get_filename (_tmp34_);
+#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp36_ = _tmp35_;
+#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp37_ = g_strdup (_tmp36_);
+#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	result = _tmp37_;
+#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_object_unref0 (profile);
+#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_object_unref0 (device);
+#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_object_unref0 (client);
+#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (device_id);
+#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return result;
+#line 1577 "simple-scan.c"
 }
 
 
@@ -1141,28 +1591,50 @@ static void simple_scan_scanner_page_info_cb (SimpleScan* self, Scanner* scanner
 	const gchar* _tmp9_;
 	gchar* _tmp10_ = NULL;
 	gchar* _tmp11_;
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (scanner != NULL);
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (info != NULL);
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = info;
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = _tmp0_->width;
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp2_ = info;
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp3_ = _tmp2_->height;
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp4_ = info;
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp5_ = _tmp4_->depth;
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_debug ("simple-scan.vala:250: Page is %d pixels wide, %d pixels high, %d bits " \
 "per pixel", _tmp1_, _tmp3_, _tmp5_);
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp6_ = simple_scan_append_page (self);
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	page = _tmp6_;
+#line 255 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp7_ = info;
+#line 255 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	page_set_page_info (page, _tmp7_);
+#line 260 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp8_ = info;
+#line 260 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp9_ = _tmp8_->device;
+#line 260 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp10_ = simple_scan_get_profile_for_device (self, _tmp9_);
+#line 260 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp11_ = _tmp10_;
+#line 260 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	page_set_color_profile (page, _tmp11_);
+#line 260 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (_tmp11_);
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_page_unref0 (page);
+#line 1637 "simple-scan.c"
 }
 
 
@@ -1173,17 +1645,29 @@ static void simple_scan_scanner_line_cb (SimpleScan* self, Scanner* scanner, Sca
 	Page* _tmp3_ = NULL;
 	Page* page;
 	ScanLine* _tmp4_;
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (scanner != NULL);
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (line != NULL);
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = self->priv->book;
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = self->priv->book;
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp2_ = book_get_n_pages (_tmp1_);
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp3_ = book_get_page (_tmp0_, ((gint) _tmp2_) - 1);
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	page = _tmp3_;
+#line 266 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp4_ = line;
+#line 266 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	page_parse_scan_line (page, _tmp4_);
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_page_unref0 (page);
+#line 1670 "simple-scan.c"
 }
 
 
@@ -1193,15 +1677,25 @@ static void simple_scan_scanner_page_done_cb (SimpleScan* self, Scanner* scanner
 	guint _tmp2_ = 0U;
 	Page* _tmp3_ = NULL;
 	Page* page;
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (scanner != NULL);
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = self->priv->book;
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = self->priv->book;
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp2_ = book_get_n_pages (_tmp1_);
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp3_ = book_get_page (_tmp0_, ((gint) _tmp2_) - 1);
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	page = _tmp3_;
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	page_finish (page);
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_page_unref0 (page);
+#line 1698 "simple-scan.c"
 }
 
 
@@ -1213,53 +1707,89 @@ static void simple_scan_remove_empty_page (SimpleScan* self) {
 	Page* page;
 	Page* _tmp4_;
 	gboolean _tmp5_ = FALSE;
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = self->priv->book;
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = self->priv->book;
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp2_ = book_get_n_pages (_tmp1_);
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp3_ = book_get_page (_tmp0_, ((gint) _tmp2_) - 1);
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	page = _tmp3_;
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp4_ = page;
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp5_ = page_has_data (_tmp4_);
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp5_) {
+#line 1728 "simple-scan.c"
 		Page* _tmp6_;
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp6_ = page;
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		page_finish (_tmp6_);
+#line 1734 "simple-scan.c"
 	} else {
 		Book* _tmp7_;
 		Page* _tmp8_;
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp7_ = self->priv->book;
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp8_ = page;
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		book_delete_page (_tmp7_, _tmp8_);
+#line 1744 "simple-scan.c"
 	}
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_page_unref0 (page);
+#line 1748 "simple-scan.c"
 }
 
 
 static void simple_scan_scanner_document_done_cb (SimpleScan* self, Scanner* scanner) {
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (scanner != NULL);
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_remove_empty_page (self);
+#line 1759 "simple-scan.c"
 }
 
 
 static void simple_scan_scanner_failed_cb (SimpleScan* self, Scanner* scanner, gint error_code, const gchar* error_string) {
 	gint _tmp0_;
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (scanner != NULL);
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (error_string != NULL);
+#line 293 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_remove_empty_page (self);
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = error_code;
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp0_ != ((gint) SANE_STATUS_CANCELLED)) {
+#line 1777 "simple-scan.c"
 		UserInterface* _tmp1_;
 		const gchar* _tmp2_ = NULL;
 		const gchar* _tmp3_;
 		gboolean _tmp4_;
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp1_ = self->priv->ui;
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp2_ = _ ("Failed to scan");
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp3_ = error_string;
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp4_ = self->priv->have_devices;
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		user_interface_show_error (_tmp1_, _tmp2_, _tmp3_, _tmp4_);
+#line 1792 "simple-scan.c"
 	}
 }
 
@@ -1268,12 +1798,19 @@ static void simple_scan_scanner_scanning_changed_cb (SimpleScan* self, Scanner*
 	UserInterface* _tmp0_;
 	Scanner* _tmp1_;
 	gboolean _tmp2_ = FALSE;
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (scanner != NULL);
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = self->priv->ui;
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = scanner;
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp2_ = scanner_is_scanning (_tmp1_);
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	user_interface_set_scanning (_tmp0_, _tmp2_);
+#line 1813 "simple-scan.c"
 }
 
 
@@ -1297,60 +1834,109 @@ static void simple_scan_scan_cb (SimpleScan* self, UserInterface* ui, const gcha
 	Scanner* _tmp17_;
 	const gchar* _tmp18_;
 	ScanOptions* _tmp19_;
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (ui != NULL);
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (options != NULL);
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = options;
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = _tmp0_->dpi;
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp2_ = device;
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_debug ("simple-scan.vala:310: Requesting scan at %d dpi from device '%s'", _tmp1_, _tmp2_);
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp3_ = self->priv->scanner;
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp4_ = scanner_is_scanning (_tmp3_);
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (!_tmp4_) {
+#line 1857 "simple-scan.c"
 		Page* _tmp5_ = NULL;
 		Page* _tmp6_;
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp5_ = simple_scan_append_page (self);
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp6_ = _tmp5_;
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_page_unref0 (_tmp6_);
+#line 1866 "simple-scan.c"
 	}
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp7_ = _ ("Scanned Document");
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp8_ = g_strdup (_tmp7_);
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	filename_prefix = _tmp8_;
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp9_ = options;
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp10_ = _tmp9_->scan_mode;
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp10_ == SCAN_MODE_COLOR) {
+#line 1880 "simple-scan.c"
 		gchar* _tmp11_;
+#line 319 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp11_ = g_strdup ("jpg");
+#line 319 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (extension);
+#line 319 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		extension = _tmp11_;
+#line 1888 "simple-scan.c"
 	} else {
 		gchar* _tmp12_;
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp12_ = g_strdup ("pdf");
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (extension);
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		extension = _tmp12_;
+#line 1897 "simple-scan.c"
 	}
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp13_ = filename_prefix;
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp14_ = extension;
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp15_ = g_strdup_printf ("%s.%s", _tmp13_, _tmp14_);
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	filename = _tmp15_;
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp16_ = ui;
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	user_interface_set_default_file_name (_tmp16_, filename);
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp17_ = self->priv->scanner;
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp18_ = device;
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp19_ = options;
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	scanner_scan (_tmp17_, _tmp18_, _tmp19_);
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (filename);
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (extension);
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (filename_prefix);
+#line 1925 "simple-scan.c"
 }
 
 
 static void simple_scan_cancel_cb (SimpleScan* self, UserInterface* ui) {
 	Scanner* _tmp0_;
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (ui != NULL);
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = self->priv->scanner;
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	scanner_cancel (_tmp0_);
+#line 1939 "simple-scan.c"
 }
 
 
@@ -1362,289 +1948,490 @@ static gchar* simple_scan_get_temporary_filename (SimpleScan* self, const gchar*
 	gchar* filename;
 	gchar* path = NULL;
 	GError * _inner_error_ = NULL;
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_val_if_fail (self != NULL, NULL);
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_val_if_fail (prefix != NULL, NULL);
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_val_if_fail (extension != NULL, NULL);
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = prefix;
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = extension;
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp2_ = g_strdup_printf ("%sXXXXXX.%s", _tmp0_, _tmp1_);
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	filename = _tmp2_;
+#line 1965 "simple-scan.c"
 	{
 		const gchar* _tmp3_;
 		gchar* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
 		gint fd;
 		gint _tmp6_;
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp3_ = filename;
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp5_ = g_file_open_tmp (_tmp3_, &_tmp4_, &_inner_error_);
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (path);
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		path = _tmp4_;
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		fd = _tmp5_;
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (_inner_error_ != NULL) {
-			goto __catch7_g_error;
+#line 1984 "simple-scan.c"
+			goto __catch8_g_error;
 		}
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp6_ = fd;
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		close (_tmp6_);
+#line 1991 "simple-scan.c"
 	}
-	goto __finally7;
-	__catch7_g_error:
+	goto __finally8;
+	__catch8_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp7_;
 		const gchar* _tmp8_;
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		e = _inner_error_;
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_inner_error_ = NULL;
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp7_ = e;
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp8_ = _tmp7_->message;
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_warning ("simple-scan.vala:346: Error saving email attachment: %s", _tmp8_);
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = NULL;
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_error_free0 (e);
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (path);
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (filename);
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
+#line 2019 "simple-scan.c"
 	}
-	__finally7:
+	__finally8:
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_inner_error_ != NULL) {
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (path);
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (filename);
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_clear_error (&_inner_error_);
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return NULL;
+#line 2034 "simple-scan.c"
 	}
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	result = path;
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (filename);
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return result;
+#line 2042 "simple-scan.c"
 }
 
 
-static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gchar* profile) {
+static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gchar* profile, gint quality) {
 	gboolean saved;
 	gchar* _tmp0_;
 	gchar* command_line;
 	const gchar* _tmp1_;
-	const gchar* _tmp40_;
+	const gchar* _tmp42_;
 	GError * _inner_error_ = NULL;
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (ui != NULL);
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (profile != NULL);
+#line 355 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	saved = FALSE;
+#line 356 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = g_strdup ("xdg-email");
+#line 356 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	command_line = _tmp0_;
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = profile;
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (g_strcmp0 (_tmp1_, "text") == 0) {
+#line 2069 "simple-scan.c"
 		gchar* _tmp2_ = NULL;
 		gchar* path;
 		const gchar* _tmp3_;
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp2_ = simple_scan_get_temporary_filename (self, "scan", "pdf");
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		path = _tmp2_;
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp3_ = path;
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (_tmp3_ != NULL) {
+#line 2081 "simple-scan.c"
 			const gchar* _tmp4_;
 			GFile* _tmp5_ = NULL;
 			GFile* file;
 			UserInterface* _tmp6_;
-			const gchar* _tmp12_;
 			const gchar* _tmp13_;
-			gchar* _tmp14_ = NULL;
-			gchar* _tmp15_;
+			const gchar* _tmp14_;
+			gchar* _tmp15_ = NULL;
 			gchar* _tmp16_;
+			gchar* _tmp17_;
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp4_ = path;
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp5_ = g_file_new_for_path (_tmp4_);
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			file = _tmp5_;
+#line 366 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp6_ = ui;
+#line 366 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			user_interface_show_progress_dialog (_tmp6_);
+#line 2101 "simple-scan.c"
 			{
 				Book* _tmp7_;
-				GFile* _tmp8_;
+				gint _tmp8_;
+				GFile* _tmp9_;
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp7_ = self->priv->book;
-				_tmp8_ = file;
-				book_save (_tmp7_, "pdf", _tmp8_, &_inner_error_);
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp8_ = quality;
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp9_ = file;
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				book_save (_tmp7_, "pdf", _tmp8_, _tmp9_, &_inner_error_);
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				if (_inner_error_ != NULL) {
-					goto __catch8_g_error;
+#line 2116 "simple-scan.c"
+					goto __catch9_g_error;
 				}
 			}
-			goto __finally8;
-			__catch8_g_error:
+			goto __finally9;
+			__catch9_g_error:
 			{
 				GError* e = NULL;
-				UserInterface* _tmp9_;
-				GError* _tmp10_;
-				const gchar* _tmp11_;
+				UserInterface* _tmp10_;
+				GError* _tmp11_;
+				const gchar* _tmp12_;
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				e = _inner_error_;
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_inner_error_ = NULL;
-				_tmp9_ = ui;
-				user_interface_hide_progress_dialog (_tmp9_);
-				_tmp10_ = e;
-				_tmp11_ = _tmp10_->message;
-				g_warning ("simple-scan.vala:374: Unable to save email file: %s", _tmp11_);
+#line 373 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp10_ = ui;
+#line 373 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				user_interface_hide_progress_dialog (_tmp10_);
+#line 374 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp11_ = e;
+#line 374 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp12_ = _tmp11_->message;
+#line 374 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				g_warning ("simple-scan.vala:374: Unable to save email file: %s", _tmp12_);
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_g_error_free0 (e);
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_g_object_unref0 (file);
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_g_free0 (path);
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_g_free0 (command_line);
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				return;
+#line 2151 "simple-scan.c"
 			}
-			__finally8:
+			__finally9:
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			if (_inner_error_ != NULL) {
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_g_object_unref0 (file);
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_g_free0 (path);
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_g_free0 (command_line);
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				g_clear_error (&_inner_error_);
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				return;
+#line 2168 "simple-scan.c"
 			}
-			_tmp12_ = command_line;
-			_tmp13_ = path;
-			_tmp14_ = g_strdup_printf (" --attach %s", _tmp13_);
-			_tmp15_ = _tmp14_;
-			_tmp16_ = g_strconcat (_tmp12_, _tmp15_, NULL);
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			_tmp13_ = command_line;
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			_tmp14_ = path;
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			_tmp15_ = g_strdup_printf (" --attach %s", _tmp14_);
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			_tmp16_ = _tmp15_;
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			_tmp17_ = g_strconcat (_tmp13_, _tmp16_, NULL);
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_free0 (command_line);
-			command_line = _tmp16_;
-			_g_free0 (_tmp15_);
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			command_line = _tmp17_;
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			_g_free0 (_tmp16_);
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_object_unref0 (file);
+#line 2188 "simple-scan.c"
 		}
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (path);
+#line 2192 "simple-scan.c"
 	} else {
 		{
 			gint i;
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			i = 0;
+#line 2198 "simple-scan.c"
 			{
-				gboolean _tmp17_;
-				_tmp17_ = TRUE;
+				gboolean _tmp18_;
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp18_ = TRUE;
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				while (TRUE) {
-					gboolean _tmp18_;
-					gint _tmp20_;
-					Book* _tmp21_;
-					guint _tmp22_ = 0U;
-					gchar* _tmp23_ = NULL;
+#line 2205 "simple-scan.c"
+					gboolean _tmp19_;
+					gint _tmp21_;
+					Book* _tmp22_;
+					guint _tmp23_ = 0U;
+					gchar* _tmp24_ = NULL;
 					gchar* path;
-					const gchar* _tmp24_;
 					const gchar* _tmp25_;
-					GFile* _tmp26_ = NULL;
+					const gchar* _tmp26_;
+					GFile* _tmp27_ = NULL;
 					GFile* file;
-					const gchar* _tmp34_;
-					const gchar* _tmp35_;
-					gchar* _tmp36_ = NULL;
-					gchar* _tmp37_;
-					gchar* _tmp38_;
-					gboolean _tmp39_;
-					_tmp18_ = _tmp17_;
-					if (!_tmp18_) {
-						gint _tmp19_;
-						_tmp19_ = i;
-						i = _tmp19_ + 1;
+					const gchar* _tmp36_;
+					const gchar* _tmp37_;
+					gchar* _tmp38_ = NULL;
+					gchar* _tmp39_;
+					gchar* _tmp40_;
+					gboolean _tmp41_;
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					_tmp19_ = _tmp18_;
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					if (!_tmp19_) {
+#line 2226 "simple-scan.c"
+						gint _tmp20_;
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+						_tmp20_ = i;
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+						i = _tmp20_ + 1;
+#line 2232 "simple-scan.c"
 					}
-					_tmp17_ = FALSE;
-					_tmp20_ = i;
-					_tmp21_ = self->priv->book;
-					_tmp22_ = book_get_n_pages (_tmp21_);
-					if (!(((guint) _tmp20_) < _tmp22_)) {
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					_tmp18_ = FALSE;
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					_tmp21_ = i;
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					_tmp22_ = self->priv->book;
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					_tmp23_ = book_get_n_pages (_tmp22_);
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					if (!(((guint) _tmp21_) < _tmp23_)) {
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						break;
+#line 2246 "simple-scan.c"
 					}
-					_tmp23_ = simple_scan_get_temporary_filename (self, "scan", "jpg");
-					path = _tmp23_;
-					_tmp24_ = path;
-					if (_tmp24_ == NULL) {
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					_tmp24_ = simple_scan_get_temporary_filename (self, "scan", "jpg");
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					path = _tmp24_;
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					_tmp25_ = path;
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					if (_tmp25_ == NULL) {
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						saved = FALSE;
+#line 388 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_free0 (path);
+#line 388 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						break;
+#line 2262 "simple-scan.c"
 					}
-					_tmp25_ = path;
-					_tmp26_ = g_file_new_for_path (_tmp25_);
-					file = _tmp26_;
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					_tmp26_ = path;
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					_tmp27_ = g_file_new_for_path (_tmp26_);
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					file = _tmp27_;
+#line 2270 "simple-scan.c"
 					{
-						Book* _tmp27_;
-						gint _tmp28_;
-						Page* _tmp29_ = NULL;
-						Page* _tmp30_;
-						GFile* _tmp31_;
-						_tmp27_ = self->priv->book;
-						_tmp28_ = i;
-						_tmp29_ = book_get_page (_tmp27_, _tmp28_);
-						_tmp30_ = _tmp29_;
-						_tmp31_ = file;
-						page_save (_tmp30_, "jpeg", _tmp31_, &_inner_error_);
-						_page_unref0 (_tmp30_);
+						Book* _tmp28_;
+						gint _tmp29_;
+						Page* _tmp30_ = NULL;
+						Page* _tmp31_;
+						gint _tmp32_;
+						GFile* _tmp33_;
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+						_tmp28_ = self->priv->book;
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+						_tmp29_ = i;
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+						_tmp30_ = book_get_page (_tmp28_, _tmp29_);
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+						_tmp31_ = _tmp30_;
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+						_tmp32_ = quality;
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+						_tmp33_ = file;
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+						page_save (_tmp31_, "jpeg", _tmp32_, _tmp33_, &_inner_error_);
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+						_page_unref0 (_tmp31_);
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						if (_inner_error_ != NULL) {
-							goto __catch9_g_error;
+#line 2296 "simple-scan.c"
+							goto __catch10_g_error;
 						}
 					}
-					goto __finally9;
-					__catch9_g_error:
+					goto __finally10;
+					__catch10_g_error:
 					{
 						GError* e = NULL;
-						GError* _tmp32_;
-						const gchar* _tmp33_;
+						GError* _tmp34_;
+						const gchar* _tmp35_;
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						e = _inner_error_;
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_inner_error_ = NULL;
-						_tmp32_ = e;
-						_tmp33_ = _tmp32_->message;
-						g_warning ("simple-scan.vala:398: Unable to save email file: %s", _tmp33_);
+#line 398 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+						_tmp34_ = e;
+#line 398 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+						_tmp35_ = _tmp34_->message;
+#line 398 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+						g_warning ("simple-scan.vala:398: Unable to save email file: %s", _tmp35_);
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_error_free0 (e);
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_object_unref0 (file);
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_free0 (path);
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_free0 (command_line);
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						return;
+#line 2326 "simple-scan.c"
 					}
-					__finally9:
+					__finally10:
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					if (_inner_error_ != NULL) {
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_object_unref0 (file);
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_free0 (path);
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_free0 (command_line);
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						g_clear_error (&_inner_error_);
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						return;
+#line 2343 "simple-scan.c"
 					}
-					_tmp34_ = command_line;
-					_tmp35_ = path;
-					_tmp36_ = g_strdup_printf (" --attach %s", _tmp35_);
-					_tmp37_ = _tmp36_;
-					_tmp38_ = g_strconcat (_tmp34_, _tmp37_, NULL);
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					_tmp36_ = command_line;
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					_tmp37_ = path;
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					_tmp38_ = g_strdup_printf (" --attach %s", _tmp37_);
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					_tmp39_ = _tmp38_;
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					_tmp40_ = g_strconcat (_tmp36_, _tmp39_, NULL);
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_g_free0 (command_line);
-					command_line = _tmp38_;
-					_g_free0 (_tmp37_);
-					_tmp39_ = saved;
-					if (!_tmp39_) {
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					command_line = _tmp40_;
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					_g_free0 (_tmp39_);
+#line 403 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					_tmp41_ = saved;
+#line 403 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					if (!_tmp41_) {
+#line 404 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_object_unref0 (file);
+#line 404 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_free0 (path);
+#line 404 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						break;
+#line 2371 "simple-scan.c"
 					}
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_g_object_unref0 (file);
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_g_free0 (path);
+#line 2377 "simple-scan.c"
 				}
 			}
 		}
 	}
-	_tmp40_ = command_line;
-	g_debug ("simple-scan.vala:408: Launching email client: %s", _tmp40_);
+#line 408 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp42_ = command_line;
+#line 408 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	g_debug ("simple-scan.vala:408: Launching email client: %s", _tmp42_);
+#line 2386 "simple-scan.c"
 	{
-		const gchar* _tmp41_;
-		_tmp41_ = command_line;
-		g_spawn_command_line_async (_tmp41_, &_inner_error_);
+		const gchar* _tmp43_;
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp43_ = command_line;
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		g_spawn_command_line_async (_tmp43_, &_inner_error_);
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (_inner_error_ != NULL) {
-			goto __catch10_g_error;
+#line 2395 "simple-scan.c"
+			goto __catch11_g_error;
 		}
 	}
-	goto __finally10;
-	__catch10_g_error:
+	goto __finally11;
+	__catch11_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp42_;
-		const gchar* _tmp43_;
+		GError* _tmp44_;
+		const gchar* _tmp45_;
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		e = _inner_error_;
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_inner_error_ = NULL;
-		_tmp42_ = e;
-		_tmp43_ = _tmp42_->message;
-		g_warning ("simple-scan.vala:415: Unable to start email: %s", _tmp43_);
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp44_ = e;
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp45_ = _tmp44_->message;
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		g_warning ("simple-scan.vala:415: Unable to start email: %s", _tmp45_);
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_error_free0 (e);
+#line 2417 "simple-scan.c"
 	}
-	__finally10:
+	__finally11:
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_inner_error_ != NULL) {
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (command_line);
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_clear_error (&_inner_error_);
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return;
+#line 2430 "simple-scan.c"
 	}
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (command_line);
+#line 2434 "simple-scan.c"
 }
 
 
@@ -1657,98 +2444,173 @@ static void simple_scan_log_cb (const gchar* log_domain, GLogLevelFlags log_leve
 	const gchar* _tmp11_;
 	const gchar* _tmp12_;
 	gboolean _tmp13_;
+#line 419 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (message != NULL);
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = log_level;
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	switch (_tmp0_ & G_LOG_LEVEL_MASK) {
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		case G_LOG_LEVEL_ERROR:
+#line 2455 "simple-scan.c"
 		{
 			gchar* _tmp1_;
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp1_ = g_strdup ("ERROR:");
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_free0 (prefix);
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			prefix = _tmp1_;
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			break;
+#line 2466 "simple-scan.c"
 		}
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		case G_LOG_LEVEL_CRITICAL:
+#line 2470 "simple-scan.c"
 		{
 			gchar* _tmp2_;
+#line 429 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp2_ = g_strdup ("CRITICAL:");
+#line 429 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_free0 (prefix);
+#line 429 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			prefix = _tmp2_;
+#line 430 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			break;
+#line 2481 "simple-scan.c"
 		}
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		case G_LOG_LEVEL_WARNING:
+#line 2485 "simple-scan.c"
 		{
 			gchar* _tmp3_;
+#line 432 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp3_ = g_strdup ("WARNING:");
+#line 432 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_free0 (prefix);
+#line 432 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			prefix = _tmp3_;
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			break;
+#line 2496 "simple-scan.c"
 		}
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		case G_LOG_LEVEL_MESSAGE:
+#line 2500 "simple-scan.c"
 		{
 			gchar* _tmp4_;
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp4_ = g_strdup ("MESSAGE:");
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_free0 (prefix);
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			prefix = _tmp4_;
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			break;
+#line 2511 "simple-scan.c"
 		}
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		case G_LOG_LEVEL_INFO:
+#line 2515 "simple-scan.c"
 		{
 			gchar* _tmp5_;
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp5_ = g_strdup ("INFO:");
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_free0 (prefix);
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			prefix = _tmp5_;
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			break;
+#line 2526 "simple-scan.c"
 		}
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		case G_LOG_LEVEL_DEBUG:
+#line 2530 "simple-scan.c"
 		{
 			gchar* _tmp6_;
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp6_ = g_strdup ("DEBUG:");
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_free0 (prefix);
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			prefix = _tmp6_;
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			break;
+#line 2541 "simple-scan.c"
 		}
 		default:
 		{
 			gchar* _tmp7_;
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp7_ = g_strdup ("LOG:");
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_free0 (prefix);
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			prefix = _tmp7_;
+#line 445 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			break;
+#line 2554 "simple-scan.c"
 		}
 	}
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp8_ = simple_scan_log_file;
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp9_ = simple_scan_log_timer;
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp10_ = g_timer_elapsed (_tmp9_, NULL);
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp11_ = prefix;
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp12_ = message;
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	fprintf (_tmp8_, "[%+.2fs] %s %s\n", _tmp10_, _tmp11_, _tmp12_);
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp13_ = simple_scan_debug_enabled;
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp13_) {
+#line 2573 "simple-scan.c"
 		FILE* _tmp14_;
 		GTimer* _tmp15_;
 		gdouble _tmp16_ = 0.0;
 		const gchar* _tmp17_;
 		const gchar* _tmp18_;
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp14_ = stderr;
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp15_ = simple_scan_log_timer;
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp16_ = g_timer_elapsed (_tmp15_, NULL);
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp17_ = prefix;
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp18_ = message;
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		fprintf (_tmp14_, "[%+.2fs] %s %s\n", _tmp16_, _tmp17_, _tmp18_);
+#line 2591 "simple-scan.c"
 	}
+#line 419 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (prefix);
+#line 2595 "simple-scan.c"
 }
 
 
 static void simple_scan_on_uevent (SimpleScan* self, GUdevClient* client, const gchar* action, GUdevDevice* device) {
 	Scanner* _tmp0_;
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (client != NULL);
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (action != NULL);
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (device != NULL);
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = self->priv->scanner;
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	scanner_redetect (_tmp0_);
+#line 2613 "simple-scan.c"
 }
 
 
@@ -1759,23 +2621,39 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	gchar* _tmp2_ = NULL;
 	gchar* end;
 	gchar* _tmp3_;
+#line 1157 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
+#line 1157 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
+#line 1157 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
+#line 1157 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	end = _tmp2_;
+#line 1158 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
+#line 1158 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
+#line 2636 "simple-scan.c"
 		glong _tmp4_;
+#line 1159 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
+#line 1159 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		result = _tmp4_;
+#line 1159 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		return result;
+#line 2644 "simple-scan.c"
 	} else {
 		gchar* _tmp5_;
 		gchar* _tmp6_;
+#line 1161 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
+#line 1161 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
+#line 1161 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
+#line 1161 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		return result;
+#line 2656 "simple-scan.c"
 	}
 }
 
@@ -1794,65 +2672,116 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp21_;
 	glong _tmp22_;
 	gchar* _tmp23_ = NULL;
+#line 1168 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
+#line 1170 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
+#line 1170 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
+#line 2681 "simple-scan.c"
 		glong _tmp2_;
+#line 1170 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
+#line 1170 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
+#line 2687 "simple-scan.c"
 	} else {
+#line 1170 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
+#line 2691 "simple-scan.c"
 	}
+#line 1170 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp3_ = _tmp0_;
+#line 1170 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	if (_tmp3_) {
+#line 2697 "simple-scan.c"
 		glong _tmp4_;
 		glong _tmp5_;
 		glong _tmp6_ = 0L;
+#line 1172 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp4_ = offset;
+#line 1172 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp5_ = len;
+#line 1172 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp6_ = string_strnlen ((gchar*) self, _tmp4_ + _tmp5_);
+#line 1172 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		string_length = _tmp6_;
+#line 2709 "simple-scan.c"
 	} else {
 		gint _tmp7_;
 		gint _tmp8_;
+#line 1174 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp7_ = strlen (self);
+#line 1174 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp7_;
+#line 1174 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp8_;
+#line 2719 "simple-scan.c"
 	}
+#line 1177 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp9_ = offset;
+#line 1177 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	if (_tmp9_ < ((glong) 0)) {
+#line 2725 "simple-scan.c"
 		glong _tmp10_;
 		glong _tmp11_;
 		glong _tmp12_;
+#line 1178 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp10_ = string_length;
+#line 1178 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
+#line 1178 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		offset = _tmp10_ + _tmp11_;
+#line 1179 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
+#line 1179 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ >= ((glong) 0), NULL);
+#line 2739 "simple-scan.c"
 	} else {
 		glong _tmp13_;
 		glong _tmp14_;
+#line 1181 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp13_ = offset;
+#line 1181 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp14_ = string_length;
+#line 1181 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp13_ <= _tmp14_, NULL);
+#line 2749 "simple-scan.c"
 	}
+#line 1183 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp15_ = len;
+#line 1183 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	if (_tmp15_ < ((glong) 0)) {
+#line 2755 "simple-scan.c"
 		glong _tmp16_;
 		glong _tmp17_;
+#line 1184 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp16_ = string_length;
+#line 1184 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp17_ = offset;
+#line 1184 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		len = _tmp16_ - _tmp17_;
+#line 2764 "simple-scan.c"
 	}
+#line 1186 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp18_ = offset;
+#line 1186 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp19_ = len;
+#line 1186 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp20_ = string_length;
+#line 1186 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp18_ + _tmp19_) <= _tmp20_, NULL);
+#line 1187 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp21_ = offset;
+#line 1187 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp22_ = len;
+#line 1187 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp23_ = g_strndup (((gchar*) self) + _tmp21_, (gsize) _tmp22_);
+#line 1187 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	result = _tmp23_;
+#line 1187 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	return result;
+#line 2784 "simple-scan.c"
 }
 
 
@@ -1885,40 +2814,75 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 	gint _tmp88_ = 0;
 	gboolean _tmp89_;
 	GError * _inner_error_ = NULL;
+#line 458 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (filename != NULL);
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = filename;
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_file_get_contents (_tmp0_, (gchar**) (&_tmp1_), &_tmp2_, &_inner_error_);
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	data = (g_free (data), NULL);
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	data = _tmp1_;
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	data_length1 = _tmp2_;
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_data_size_ = data_length1;
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_inner_error_ != NULL) {
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_propagate_error (error, _inner_error_);
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		data = (g_free (data), NULL);
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return;
+#line 2839 "simple-scan.c"
 	}
+#line 463 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp3_ = filename;
+#line 463 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp4_ = g_strconcat (_tmp3_, ".fixed", NULL);
+#line 463 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp5_ = _tmp4_;
-	_tmp6_ = fopen (_tmp5_, "w");
+#line 463 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp6_ = g_fopen (_tmp5_, "w");
+#line 463 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp7_ = _tmp6_;
+#line 463 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (_tmp5_);
+#line 463 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	fixed_file = _tmp7_;
+#line 465 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	offset = 0;
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	line_number = 0;
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	xref_offset = 0;
+#line 468 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	xref_line = -1;
-	_tmp8_ = g_regex_new ("^\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d 0000 n$", 0, 0, &_inner_error_);
+#line 469 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp8_ = g_regex_new ("^\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d 0000 n$", G_REGEX_RAW, 0, &_inner_error_);
+#line 469 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	xref_regex = _tmp8_;
+#line 469 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_inner_error_ != NULL) {
+#line 469 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_propagate_error (error, _inner_error_);
+#line 469 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_fclose0 (fixed_file);
+#line 469 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		data = (g_free (data), NULL);
+#line 469 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return;
+#line 2877 "simple-scan.c"
 	}
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp9_ = g_string_new ("");
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	line = _tmp9_;
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	while (TRUE) {
+#line 2885 "simple-scan.c"
 		gint _tmp10_;
 		guint8* _tmp11_;
 		gint _tmp11__length1;
@@ -1932,17 +2896,29 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 		gboolean _tmp31_;
 		gint _tmp82_;
 		gint _tmp83_;
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp10_ = offset;
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp11_ = data;
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp11__length1 = data_length1;
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (!(_tmp10_ < _tmp11__length1)) {
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			break;
+#line 2909 "simple-scan.c"
 		}
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp12_ = offset;
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		end_offset = _tmp12_;
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp13_ = line;
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_string_assign (_tmp13_, "");
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		while (TRUE) {
+#line 2921 "simple-scan.c"
 			gint _tmp14_;
 			guint8* _tmp15_;
 			gint _tmp15__length1;
@@ -1955,103 +2931,180 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 			guint8 _tmp20_;
 			gint _tmp21_;
 			guint8 _tmp22_;
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp14_ = end_offset;
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp15_ = data;
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp15__length1 = data_length1;
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			if (!(_tmp14_ < _tmp15__length1)) {
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				break;
+#line 2944 "simple-scan.c"
 			}
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp16_ = data;
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp16__length1 = data_length1;
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp17_ = end_offset;
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp18_ = _tmp16_[_tmp17_];
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			c = _tmp18_;
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp19_ = line;
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp20_ = c;
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			g_string_append_c (_tmp19_, (gchar) _tmp20_);
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp21_ = end_offset;
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			end_offset = _tmp21_ + 1;
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp22_ = c;
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			if (_tmp22_ == ((guint8) '\n')) {
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				break;
+#line 2972 "simple-scan.c"
 			}
 		}
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp23_ = line;
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp24_ = _tmp23_->str;
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (g_strcmp0 (_tmp24_, "startxref\n") == 0) {
+#line 2981 "simple-scan.c"
 			gint _tmp25_;
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp25_ = line_number;
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			xref_line = _tmp25_;
+#line 2987 "simple-scan.c"
 		}
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp27_ = line_number;
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (_tmp27_ < 2) {
+#line 2993 "simple-scan.c"
 			GString* _tmp28_;
 			const gchar* _tmp29_;
 			gboolean _tmp30_ = FALSE;
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp28_ = line;
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp29_ = _tmp28_->str;
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp30_ = g_str_has_prefix (_tmp29_, "%%");
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp26_ = _tmp30_;
+#line 3005 "simple-scan.c"
 		} else {
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp26_ = FALSE;
+#line 3009 "simple-scan.c"
 		}
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp31_ = _tmp26_;
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (_tmp31_) {
+#line 3015 "simple-scan.c"
 			gint _tmp32_;
 			FILE* _tmp33_;
 			GString* _tmp34_;
 			const gchar* _tmp35_;
 			gchar* _tmp36_ = NULL;
 			gchar* _tmp37_;
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp32_ = xref_offset;
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			xref_offset = _tmp32_ - 1;
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp33_ = fixed_file;
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp34_ = line;
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp35_ = _tmp34_->str;
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp36_ = string_substring (_tmp35_, (glong) 1, (glong) (-1));
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp37_ = _tmp36_;
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			fprintf (_tmp33_, "%s", _tmp37_);
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_free0 (_tmp37_);
+#line 3040 "simple-scan.c"
 		} else {
 			GRegex* _tmp38_;
 			GString* _tmp39_;
 			const gchar* _tmp40_;
 			GMatchInfo* _tmp41_ = NULL;
 			gboolean _tmp42_ = FALSE;
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp38_ = xref_regex;
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp39_ = line;
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp40_ = _tmp39_->str;
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp42_ = g_regex_match (_tmp38_, _tmp40_, 0, &_tmp41_);
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_match_info_free0 (xref_match);
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			xref_match = _tmp41_;
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			if (_tmp42_) {
+#line 3061 "simple-scan.c"
 				FILE* _tmp43_;
 				GMatchInfo* _tmp44_;
 				const gchar* _tmp45_ = NULL;
 				gint _tmp46_ = 0;
 				gint _tmp47_;
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp43_ = fixed_file;
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp44_ = xref_match;
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp45_ = g_match_info_get_string (_tmp44_);
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp46_ = atoi (_tmp45_);
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp47_ = xref_offset;
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				fprintf (_tmp43_, "%010d 00000 n \n", _tmp46_ + _tmp47_);
+#line 3079 "simple-scan.c"
 			} else {
 				gboolean _tmp48_ = FALSE;
 				gint _tmp49_;
 				gboolean _tmp52_;
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp49_ = xref_line;
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				if (_tmp49_ > 0) {
+#line 3088 "simple-scan.c"
 					gint _tmp50_;
 					gint _tmp51_;
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp50_ = line_number;
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp51_ = xref_line;
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp48_ = _tmp50_ == (_tmp51_ + 1);
+#line 3097 "simple-scan.c"
 				} else {
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp48_ = FALSE;
+#line 3101 "simple-scan.c"
 				}
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp52_ = _tmp48_;
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				if (_tmp52_) {
+#line 3107 "simple-scan.c"
 					FILE* _tmp53_;
 					GString* _tmp54_;
 					const gchar* _tmp55_;
@@ -2059,57 +3112,95 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 					gint _tmp57_;
 					gchar* _tmp58_ = NULL;
 					gchar* _tmp59_;
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp53_ = fixed_file;
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp54_ = line;
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp55_ = _tmp54_->str;
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp56_ = atoi (_tmp55_);
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp57_ = xref_offset;
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp58_ = g_strdup_printf ("%d\n", _tmp56_ + _tmp57_);
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp59_ = _tmp58_;
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					fprintf (_tmp53_, "%s", _tmp59_);
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_g_free0 (_tmp59_);
+#line 3133 "simple-scan.c"
 				} else {
 					gboolean _tmp60_ = FALSE;
 					gint _tmp61_;
 					gint _tmp62_;
 					gboolean _tmp66_;
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp61_ = line_number;
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp62_ = xref_line;
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					if (_tmp61_ == (_tmp62_ + 2)) {
+#line 3145 "simple-scan.c"
 						GString* _tmp63_;
 						const gchar* _tmp64_;
 						gboolean _tmp65_ = FALSE;
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp63_ = line;
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp64_ = _tmp63_->str;
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp65_ = g_str_has_prefix (_tmp64_, "%%%%");
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp60_ = _tmp65_;
+#line 3157 "simple-scan.c"
 					} else {
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp60_ = FALSE;
+#line 3161 "simple-scan.c"
 					}
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp66_ = _tmp60_;
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					if (_tmp66_) {
+#line 3167 "simple-scan.c"
 						FILE* _tmp67_;
 						GString* _tmp68_;
 						const gchar* _tmp69_;
 						gchar* _tmp70_ = NULL;
 						gchar* _tmp71_;
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp67_ = fixed_file;
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp68_ = line;
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp69_ = _tmp68_->str;
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp70_ = string_substring (_tmp69_, (glong) 2, (glong) (-1));
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp71_ = _tmp70_;
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						fprintf (_tmp67_, "%s", _tmp71_);
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_free0 (_tmp71_);
+#line 3187 "simple-scan.c"
 					} else {
 						{
 							gint _tmp72_;
 							gint i;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							_tmp72_ = offset;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							i = _tmp72_;
+#line 3196 "simple-scan.c"
 							{
 								gboolean _tmp73_;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 								_tmp73_ = TRUE;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 								while (TRUE) {
+#line 3203 "simple-scan.c"
 									gboolean _tmp74_;
 									gint _tmp76_;
 									gint _tmp77_;
@@ -2118,24 +3209,43 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 									gint _tmp79__length1;
 									gint _tmp80_;
 									guint8 _tmp81_;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 									_tmp74_ = _tmp73_;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 									if (!_tmp74_) {
+#line 3216 "simple-scan.c"
 										gint _tmp75_;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 										_tmp75_ = i;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 										i = _tmp75_ + 1;
+#line 3222 "simple-scan.c"
 									}
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 									_tmp73_ = FALSE;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 									_tmp76_ = i;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 									_tmp77_ = end_offset;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 									if (!(_tmp76_ < _tmp77_)) {
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 										break;
+#line 3234 "simple-scan.c"
 									}
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 									_tmp78_ = fixed_file;
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 									_tmp79_ = data;
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 									_tmp79__length1 = data_length1;
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 									_tmp80_ = i;
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 									_tmp81_ = _tmp79_[_tmp80_];
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 									fputc ((gchar) _tmp81_, _tmp78_);
+#line 3248 "simple-scan.c"
 								}
 							}
 						}
@@ -2143,40 +3253,69 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 				}
 			}
 		}
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp82_ = line_number;
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		line_number = _tmp82_ + 1;
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp83_ = end_offset;
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		offset = _tmp83_;
+#line 3264 "simple-scan.c"
 	}
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp84_ = filename;
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp85_ = filename;
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp86_ = g_strconcat (_tmp85_, "~", NULL);
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp87_ = _tmp86_;
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp88_ = g_rename (_tmp84_, _tmp87_);
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp89_ = _tmp88_ >= 0;
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (_tmp87_);
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp89_) {
+#line 3282 "simple-scan.c"
 		const gchar* _tmp90_;
 		gchar* _tmp91_;
 		gchar* _tmp92_;
 		const gchar* _tmp93_;
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp90_ = filename;
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp91_ = g_strconcat (_tmp90_, ".fixed", NULL);
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp92_ = _tmp91_;
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp93_ = filename;
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_rename (_tmp92_, _tmp93_);
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (_tmp92_);
+#line 3299 "simple-scan.c"
 	}
+#line 458 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_string_free0 (line);
+#line 458 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_match_info_free0 (xref_match);
+#line 458 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_regex_unref0 (xref_regex);
+#line 458 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_fclose0 (fixed_file);
+#line 458 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	data = (g_free (data), NULL);
+#line 3311 "simple-scan.c"
 }
 
 
 static void _simple_scan_log_cb_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message, gpointer self) {
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_log_cb (log_domain, log_levels, message);
+#line 3318 "simple-scan.c"
 }
 
 
@@ -2209,29 +3348,47 @@ gint simple_scan_main (gchar** args, int args_length1) {
 	SimpleScan* _tmp50_;
 	gint _tmp51_ = 0;
 	GError * _inner_error_ = NULL;
+#line 521 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	setlocale (LC_ALL, "");
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR);
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	textdomain (GETTEXT_PACKAGE);
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	gtk_init (&args_length1, &args);
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = _ ("[DEVICE...] - Scanning utility");
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = g_option_context_new (_tmp0_);
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	c = _tmp1_;
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp2_ = c;
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_option_context_add_main_entries (_tmp2_, SIMPLE_SCAN_options, GETTEXT_PACKAGE);
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp3_ = c;
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp4_ = gtk_get_option_group (TRUE);
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_option_context_add_group (_tmp3_, _tmp4_);
+#line 3377 "simple-scan.c"
 	{
 		GOptionContext* _tmp5_;
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp5_ = c;
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_option_context_parse (_tmp5_, &args_length1, &args, &_inner_error_);
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (_inner_error_ != NULL) {
-			goto __catch11_g_error;
+#line 3386 "simple-scan.c"
+			goto __catch12_g_error;
 		}
 	}
-	goto __finally11;
-	__catch11_g_error:
+	goto __finally12;
+	__catch12_g_error:
 	{
 		GError* e = NULL;
 		FILE* _tmp6_;
@@ -2243,57 +3400,103 @@ gint simple_scan_main (gchar** args, int args_length1) {
 		gint _tmp11__length1;
 		const gchar* _tmp12_;
 		FILE* _tmp13_;
+#line 532 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		e = _inner_error_;
+#line 532 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_inner_error_ = NULL;
+#line 538 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp6_ = stderr;
+#line 538 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp7_ = e;
+#line 538 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp8_ = _tmp7_->message;
+#line 538 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		fprintf (_tmp6_, "%s\n", _tmp8_);
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp9_ = stderr;
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp10_ = _ ("Run '%s --help' to see a full list of available command line options.");
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp11_ = args;
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp11__length1 = args_length1;
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp12_ = _tmp11_[0];
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		fprintf (_tmp9_, _tmp10_, _tmp12_);
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp13_ = stderr;
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		fprintf (_tmp13_, "\n");
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = EXIT_FAILURE;
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_error_free0 (e);
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_option_context_free0 (c);
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
+#line 3439 "simple-scan.c"
 	}
-	__finally11:
+	__finally12:
+#line 532 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_inner_error_ != NULL) {
+#line 532 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_option_context_free0 (c);
+#line 532 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 532 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_clear_error (&_inner_error_);
+#line 532 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return 0;
+#line 3452 "simple-scan.c"
 	}
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp14_ = simple_scan_show_version;
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp14_) {
+#line 3458 "simple-scan.c"
 		FILE* _tmp15_;
+#line 547 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp15_ = stderr;
+#line 547 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		fprintf (_tmp15_, "simple-scan %s\n", VERSION);
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = EXIT_SUCCESS;
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_option_context_free0 (c);
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
+#line 3470 "simple-scan.c"
 	}
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp16_ = simple_scan_fix_pdf_filename;
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp16_ != NULL) {
+#line 3476 "simple-scan.c"
 		{
 			const gchar* _tmp17_;
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp17_ = simple_scan_fix_pdf_filename;
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			simple_scan_fix_pdf (_tmp17_, &_inner_error_);
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			if (_inner_error_ != NULL) {
-				goto __catch12_g_error;
+#line 3485 "simple-scan.c"
+				goto __catch13_g_error;
 			}
 			{
 				gint i;
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				i = 1;
+#line 3492 "simple-scan.c"
 				{
 					gboolean _tmp18_;
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp18_ = TRUE;
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					while (TRUE) {
+#line 3499 "simple-scan.c"
 						gboolean _tmp19_;
 						gint _tmp21_;
 						gchar** _tmp22_;
@@ -2302,64 +3505,110 @@ gint simple_scan_main (gchar** args, int args_length1) {
 						gint _tmp23__length1;
 						gint _tmp24_;
 						const gchar* _tmp25_;
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp19_ = _tmp18_;
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						if (!_tmp19_) {
+#line 3512 "simple-scan.c"
 							gint _tmp20_;
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							_tmp20_ = i;
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							i = _tmp20_ + 1;
+#line 3518 "simple-scan.c"
 						}
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp18_ = FALSE;
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp21_ = i;
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp22_ = args;
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp22__length1 = args_length1;
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						if (!(_tmp21_ < _tmp22__length1)) {
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							break;
+#line 3532 "simple-scan.c"
 						}
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp23_ = args;
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp23__length1 = args_length1;
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp24_ = i;
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp25_ = _tmp23_[_tmp24_];
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						simple_scan_fix_pdf (_tmp25_, &_inner_error_);
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						if (_inner_error_ != NULL) {
-							goto __catch12_g_error;
+#line 3546 "simple-scan.c"
+							goto __catch13_g_error;
 						}
 					}
 				}
 			}
 		}
-		goto __finally12;
-		__catch12_g_error:
+		goto __finally13;
+		__catch13_g_error:
 		{
 			GError* e = NULL;
 			FILE* _tmp26_;
 			GError* _tmp27_;
 			const gchar* _tmp28_;
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			e = _inner_error_;
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_inner_error_ = NULL;
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp26_ = stderr;
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp27_ = e;
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp28_ = _tmp27_->message;
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			fprintf (_tmp26_, "Error fixing PDF file: %s", _tmp28_);
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			result = EXIT_FAILURE;
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_error_free0 (e);
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_option_context_free0 (c);
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			return result;
+#line 3580 "simple-scan.c"
 		}
-		__finally12:
+		__finally13:
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (_inner_error_ != NULL) {
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_option_context_free0 (c);
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			g_clear_error (&_inner_error_);
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			return 0;
+#line 3593 "simple-scan.c"
 		}
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = EXIT_SUCCESS;
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_option_context_free0 (c);
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
+#line 3601 "simple-scan.c"
 	}
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	device = NULL;
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp29_ = args;
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp29__length1 = args_length1;
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp29__length1 > 1) {
+#line 3611 "simple-scan.c"
 		ScanDevice* _tmp30_;
 		ScanDevice* _tmp31_;
 		gchar** _tmp32_;
@@ -2371,89 +3620,160 @@ gint simple_scan_main (gchar** args, int args_length1) {
 		gint _tmp36__length1;
 		const gchar* _tmp37_;
 		gchar* _tmp38_;
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp30_ = scan_device_new ();
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_scan_device_unref0 (device);
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		device = _tmp30_;
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp31_ = device;
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp32_ = args;
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp32__length1 = args_length1;
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp33_ = _tmp32_[1];
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp34_ = g_strdup (_tmp33_);
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (_tmp31_->name);
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp31_->name = _tmp34_;
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp35_ = device;
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp36_ = args;
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp36__length1 = args_length1;
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp37_ = _tmp36_[1];
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp38_ = g_strdup (_tmp37_);
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (_tmp35_->label);
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp35_->label = _tmp38_;
+#line 3657 "simple-scan.c"
 	}
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp39_ = g_timer_new ();
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_timer_destroy0 (simple_scan_log_timer);
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_log_timer = _tmp39_;
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp40_ = g_get_user_cache_dir ();
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp41_ = g_build_filename (_tmp40_, "simple-scan", NULL, NULL);
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	path = _tmp41_;
+#line 577 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp42_ = path;
+#line 577 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_mkdir_with_parents (_tmp42_, 0700);
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp43_ = g_get_user_cache_dir ();
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp44_ = g_build_filename (_tmp43_, "simple-scan", "simple-scan.log", NULL, NULL);
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (path);
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	path = _tmp44_;
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp45_ = path;
-	_tmp46_ = fopen (_tmp45_, "w");
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp46_ = g_fopen (_tmp45_, "w");
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_fclose0 (simple_scan_log_file);
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_log_file = _tmp46_;
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_log_set_default_handler (_simple_scan_log_cb_glog_func, NULL);
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp47_ = getpid ();
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_debug ("simple-scan.vala:582: Starting Simple Scan %s, PID=%i", VERSION, (gint) _tmp47_);
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp48_ = device;
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp49_ = simple_scan_new (_tmp48_);
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	app = _tmp49_;
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp50_ = app;
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp51_ = g_application_run ((GApplication*) _tmp50_, 0, NULL);
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	result = _tmp51_;
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_object_unref0 (app);
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (path);
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_scan_device_unref0 (device);
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_option_context_free0 (c);
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return result;
+#line 3719 "simple-scan.c"
 }
 
 
 int main (int argc, char ** argv) {
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_type_init ();
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return simple_scan_main (argv, argc);
+#line 3728 "simple-scan.c"
 }
 
 
 static void simple_scan_class_init (SimpleScanClass * klass) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_parent_class = g_type_class_peek_parent (klass);
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_type_class_add_private (klass, sizeof (SimpleScanPrivate));
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	G_APPLICATION_CLASS (klass)->startup = simple_scan_real_startup;
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	G_APPLICATION_CLASS (klass)->activate = simple_scan_real_activate;
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	G_APPLICATION_CLASS (klass)->shutdown = simple_scan_real_shutdown;
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	G_OBJECT_CLASS (klass)->finalize = simple_scan_finalize;
+#line 3745 "simple-scan.c"
 }
 
 
 static void simple_scan_instance_init (SimpleScan * self) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self->priv = SIMPLE_SCAN_GET_PRIVATE (self);
+#line 32 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self->priv->default_device = NULL;
+#line 33 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self->priv->have_devices = FALSE;
+#line 3756 "simple-scan.c"
 }
 
 
 static void simple_scan_finalize (GObject* obj) {
 	SimpleScan * self;
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SIMPLE_SCAN, SimpleScan);
+#line 32 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_scan_device_unref0 (self->priv->default_device);
+#line 34 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_object_unref0 (self->priv->udev_client);
+#line 35 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_user_interface_unref0 (self->priv->ui);
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_scanner_unref0 (self->priv->scanner);
+#line 37 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_book_unref0 (self->priv->book);
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	G_OBJECT_CLASS (simple_scan_parent_class)->finalize (obj);
+#line 3776 "simple-scan.c"
 }
 
 
diff --git a/src/simple-scan.vala b/src/simple-scan.vala
index 1176053..14e70ea 100644
--- a/src/simple-scan.vala
+++ b/src/simple-scan.vala
@@ -350,7 +350,7 @@ public class SimpleScan : Gtk.Application
         return path;
     }
 
-    private void email_cb (UserInterface ui, string profile)
+    private void email_cb (UserInterface ui, string profile, int quality)
     {
         var saved = false;
         var command_line = "xdg-email";
@@ -366,7 +366,7 @@ public class SimpleScan : Gtk.Application
                 ui.show_progress_dialog ();
                 try
                 {
-                    book.save ("pdf", file);
+                    book.save ("pdf", quality, file);
                 }
                 catch (Error e)
                 {
@@ -391,7 +391,7 @@ public class SimpleScan : Gtk.Application
                 var file = File.new_for_path (path);
                 try
                 {
-                    book.get_page (i).save ("jpeg", file);
+                    book.get_page (i).save ("jpeg", quality, file);
                 }
                 catch (Error e)
                 {
@@ -466,7 +466,7 @@ public class SimpleScan : Gtk.Application
         var line_number = 0;
         var xref_offset = 0;
         var xref_line = -1;
-        var xref_regex = new Regex ("^\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d 0000 n$");
+        var xref_regex = new Regex ("^\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d 0000 n$", RegexCompileFlags.RAW);
         MatchInfo xref_match;
         var line = new StringBuilder ();
         while (offset < data.length)
@@ -519,15 +519,15 @@ public class SimpleScan : Gtk.Application
     public static int main (string[] args)
     {
         Intl.setlocale (LocaleCategory.ALL, "");
-        Intl.bindtextdomain (Config.GETTEXT_PACKAGE, Config.LOCALE_DIR);
-        Intl.bind_textdomain_codeset (Config.GETTEXT_PACKAGE, "UTF-8");
-        Intl.textdomain (Config.GETTEXT_PACKAGE);
+        Intl.bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR);
+        Intl.bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+        Intl.textdomain (GETTEXT_PACKAGE);
 
         Gtk.init (ref args);
 
         var c = new OptionContext (/* Arguments and description for --help text */
                                    _("[DEVICE...] - Scanning utility"));
-        c.add_main_entries (options, Config.GETTEXT_PACKAGE);
+        c.add_main_entries (options, GETTEXT_PACKAGE);
         c.add_group (Gtk.get_option_group (true));
         try
         {
@@ -544,7 +544,7 @@ public class SimpleScan : Gtk.Application
         if (show_version)
         {
             /* Note, not translated so can be easily parsed */
-            stderr.printf ("simple-scan %s\n", Config.VERSION);
+            stderr.printf ("simple-scan %s\n", VERSION);
             return Posix.EXIT_SUCCESS;
         }
         if (fix_pdf_filename != null)
@@ -579,7 +579,7 @@ public class SimpleScan : Gtk.Application
         log_file = FileStream.open (path, "w");
         Log.set_default_handler (log_cb);
 
-        debug ("Starting Simple Scan %s, PID=%i", Config.VERSION, Posix.getpid ());
+        debug ("Starting Simple Scan %s, PID=%i", VERSION, Posix.getpid ());
 
         var app = new SimpleScan (device);
         return app.run ();
diff --git a/src/ui.c b/src/ui.c
index 63d0613..4c0d0b5 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -1,4 +1,4 @@
-/* ui.c generated by valac 0.18.1, the Vala compiler
+/* ui.c generated by valac 0.20.1, the Vala compiler
  * generated from ui.vala, do not modify */
 
 /*
@@ -19,12 +19,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib/gi18n-lib.h>
-#include <cairo.h>
 #include <float.h>
 #include <math.h>
+#include <cairo.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk/gdk.h>
-#include "config.h"
 #include <glib/gstdio.h>
 #include <unistd.h>
 #include <gobject/gvaluecollector.h>
@@ -61,6 +60,16 @@ typedef struct _ProgressBarDialogClass ProgressBarDialogClass;
 typedef struct _Book Book;
 typedef struct _BookClass BookClass;
 
+#define TYPE_AUTOSAVE_MANAGER (autosave_manager_get_type ())
+#define AUTOSAVE_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_AUTOSAVE_MANAGER, AutosaveManager))
+#define AUTOSAVE_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_AUTOSAVE_MANAGER, AutosaveManagerClass))
+#define IS_AUTOSAVE_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_AUTOSAVE_MANAGER))
+#define IS_AUTOSAVE_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_AUTOSAVE_MANAGER))
+#define AUTOSAVE_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_AUTOSAVE_MANAGER, AutosaveManagerClass))
+
+typedef struct _AutosaveManager AutosaveManager;
+typedef struct _AutosaveManagerClass AutosaveManagerClass;
+
 #define TYPE_BOOK_VIEW (book_view_get_type ())
 #define BOOK_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_BOOK_VIEW, BookView))
 #define BOOK_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_BOOK_VIEW, BookViewClass))
@@ -85,6 +94,7 @@ typedef struct _PageClass PageClass;
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 #define _g_free0(var) (var = (g_free (var), NULL))
 #define _book_unref0(var) ((var == NULL) ? NULL : (var = (book_unref (var), NULL)))
+#define _autosave_manager_unref0(var) ((var == NULL) ? NULL : (var = (autosave_manager_unref (var), NULL)))
 
 #define TYPE_SCAN_DEVICE (scan_device_get_type ())
 #define SCAN_DEVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SCAN_DEVICE, ScanDevice))
@@ -153,6 +163,7 @@ struct _UserInterfacePrivate {
 	GtkMenuItem* crop_rotate_menuitem;
 	GtkMenuItem* save_menuitem;
 	GtkMenuItem* save_as_menuitem;
+	GtkMenuItem* copy_to_clipboard_menuitem;
 	GtkToolButton* save_toolbutton;
 	GtkMenuItem* stop_menuitem;
 	GtkToolButton* stop_toolbutton;
@@ -170,11 +181,17 @@ struct _UserInterfacePrivate {
 	GtkComboBox* photo_dpi_combo;
 	GtkComboBox* page_side_combo;
 	GtkComboBox* paper_size_combo;
+	GtkScale* brightness_scale;
+	GtkScale* contrast_scale;
+	GtkScale* quality_scale;
 	GtkListStore* device_model;
 	GtkListStore* text_dpi_model;
 	GtkListStore* photo_dpi_model;
 	GtkListStore* page_side_model;
 	GtkListStore* paper_size_model;
+	GtkAdjustment* brightness_adjustment;
+	GtkAdjustment* contrast_adjustment;
+	GtkAdjustment* quality_adjustment;
 	gboolean setting_devices;
 	gboolean user_selected_device;
 	GtkFileChooserDialog* save_dialog;
@@ -185,6 +202,7 @@ struct _UserInterfacePrivate {
 	gboolean error_change_scanner_hint;
 	Book* book;
 	gchar* book_uri;
+	AutosaveManager* autosave_manager;
 	BookView* book_view;
 	gboolean updating_page_menu;
 	gint default_page_width;
@@ -236,6 +254,8 @@ struct _ScanOptions {
 	ScanType type;
 	gint paper_width;
 	gint paper_height;
+	gint brightness;
+	gint contrast;
 };
 
 struct _ScanOptionsClass {
@@ -279,6 +299,13 @@ void value_set_book (GValue* value, gpointer v_object);
 void value_take_book (GValue* value, gpointer v_object);
 gpointer value_get_book (const GValue* value);
 GType book_get_type (void) G_GNUC_CONST;
+gpointer autosave_manager_ref (gpointer instance);
+void autosave_manager_unref (gpointer instance);
+GParamSpec* param_spec_autosave_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
+void value_set_autosave_manager (GValue* value, gpointer v_object);
+void value_take_autosave_manager (GValue* value, gpointer v_object);
+gpointer value_get_autosave_manager (const GValue* value);
+GType autosave_manager_get_type (void) G_GNUC_CONST;
 GType book_view_get_type (void) G_GNUC_CONST;
 GType scan_direction_get_type (void) G_GNUC_CONST;
 #define USER_INTERFACE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_USER_INTERFACE, UserInterfacePrivate))
@@ -303,6 +330,7 @@ UserInterface* user_interface_construct (GType object_type);
 Book* book_new (void);
 Book* book_construct (GType object_type);
 static void user_interface_load (UserInterface* self);
+AutosaveManager* autosave_manager_create (Book** book);
 static gboolean user_interface_find_scan_device (UserInterface* self, const gchar* device, GtkTreeIter* iter);
 static void user_interface_show_error_dialog (UserInterface* self, const gchar* error_title, const gchar* error_text);
 void user_interface_set_default_file_name (UserInterface* self, const gchar* default_file_name);
@@ -323,11 +351,13 @@ static void user_interface_add_default_page (UserInterface* self);
 Page* book_append_page (Book* self, gint width, gint height, gint dpi, ScanDirection scan_direction);
 void book_view_select_page (BookView* self, Page* page);
 static void user_interface_on_file_type_changed (UserInterface* self, GtkTreeSelection* selection);
+static gchar* user_interface_get_selected_extension (UserInterface* self, GtkTreeSelection* selection);
 static gchar* user_interface_choose_file_location (UserInterface* self);
 static void _user_interface_on_file_type_changed_gtk_tree_selection_changed (GtkTreeSelection* _sender, gpointer self);
 static gboolean user_interface_save_document (UserInterface* self, gboolean force_choose_location);
 void user_interface_show_progress_dialog (UserInterface* self);
-void book_save (Book* self, const gchar* type, GFile* file, GError** error);
+void book_save (Book* self, const gchar* type, gint quality, GFile* file, GError** error);
+static gint user_interface_get_quality (UserInterface* self);
 void user_interface_hide_progress_dialog (UserInterface* self);
 void user_interface_show_error (UserInterface* self, const gchar* error_title, const gchar* error_text, gboolean change_scanner_hint);
 void book_set_needs_saving (Book* self, gboolean needs_saving);
@@ -342,10 +372,15 @@ void G_MODULE_EXPORT photo_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserIn
 GType scan_type_get_type (void) G_GNUC_CONST;
 static void user_interface_set_page_side (UserInterface* self, ScanType page_side);
 static void user_interface_set_paper_size (UserInterface* self, gint width, gint height);
+static void user_interface_set_brightness (UserInterface* self, gint brightness);
+static void user_interface_set_contrast (UserInterface* self, gint contrast);
+static void user_interface_set_quality (UserInterface* self, gint quality);
 static gint user_interface_get_text_dpi (UserInterface* self);
 static gint user_interface_get_photo_dpi (UserInterface* self);
 static ScanType user_interface_get_page_side (UserInterface* self);
 static gboolean user_interface_get_paper_size (UserInterface* self, gint* width, gint* height);
+static gint user_interface_get_brightness (UserInterface* self);
+static gint user_interface_get_contrast (UserInterface* self);
 gpointer scan_options_ref (gpointer instance);
 void scan_options_unref (gpointer instance);
 GParamSpec* param_spec_scan_options (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -372,7 +407,7 @@ gboolean page_has_crop (Page* self);
 gchar* page_get_named_crop (Page* self);
 static void user_interface_show_page_cb (UserInterface* self, BookView* view, Page* page);
 gchar* get_temporary_filename (const gchar* prefix, const gchar* extension);
-void page_save (Page* self, const gchar* type, GFile* file, GError** error);
+void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError** error);
 static void user_interface_show_page_menu_cb (UserInterface* self, BookView* view);
 void G_MODULE_EXPORT rotate_left_button_clicked_cb (GtkWidget* widget, UserInterface* self);
 void page_rotate_left (Page* self);
@@ -403,6 +438,8 @@ void G_MODULE_EXPORT page_delete_menuitem_activate_cb (GtkWidget* widget, UserIn
 Book* book_view_get_book (BookView* self);
 void book_delete_page (Book* self, Page* page);
 void G_MODULE_EXPORT save_file_button_clicked_cb (GtkWidget* widget, UserInterface* self);
+void G_MODULE_EXPORT copy_to_clipboard_button_clicked_cb (GtkWidget* widget, UserInterface* self);
+void page_copy_to_clipboard (Page* self, GtkWindow* window);
 void G_MODULE_EXPORT save_as_file_button_clicked_cb (GtkWidget* widget, UserInterface* self);
 static void user_interface_draw_page (UserInterface* self, GtkPrintOperation* operation, GtkPrintContext* print_context, gint page_number);
 Page* book_get_page (Book* self, gint page_number);
@@ -415,6 +452,7 @@ static void _user_interface_draw_page_gtk_print_operation_draw_page (GtkPrintOpe
 void G_MODULE_EXPORT help_contents_menuitem_activate_cb (GtkWidget* widget, UserInterface* self);
 void G_MODULE_EXPORT about_menuitem_activate_cb (GtkWidget* widget, UserInterface* self);
 static gboolean user_interface_on_quit (UserInterface* self);
+void autosave_manager_cleanup (AutosaveManager* self);
 void G_MODULE_EXPORT quit_menuitem_activate_cb (GtkWidget* widget, UserInterface* self);
 gboolean G_MODULE_EXPORT simple_scan_window_configure_event_cb (GtkWidget* widget, GdkEventConfigure* event, UserInterface* self);
 static void user_interface_info_bar_response_cb (UserInterface* self, GtkInfoBar* widget, gint response_id);
@@ -438,8 +476,8 @@ ProgressBarDialog* progress_bar_dialog_new (GtkWindow* parent, const gchar* titl
 ProgressBarDialog* progress_bar_dialog_construct (GType object_type, GtkWindow* parent, const gchar* title);
 static void user_interface_book_saving_cb (UserInterface* self, gint page_number);
 static void _user_interface_book_saving_cb_book_saving (Book* _sender, gint i, gpointer self);
-static gboolean ___lambda2_ (UserInterface* self);
-static gboolean ____lambda2__gsource_func (gpointer self);
+static gboolean ___lambda3_ (UserInterface* self);
+static gboolean ____lambda3__gsource_func (gpointer self);
 void progress_bar_dialog_set_fraction (ProgressBarDialog* self, gdouble percent);
 void progress_bar_dialog_set_message (ProgressBarDialog* self, const gchar* message);
 Book* user_interface_get_book (UserInterface* self);
@@ -448,6 +486,7 @@ Page* user_interface_get_selected_page (UserInterface* self);
 void user_interface_set_scanning (UserInterface* self, gboolean scanning);
 void user_interface_start (UserInterface* self);
 static void g_cclosure_user_marshal_VOID__STRING_SCAN_OPTIONS (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
+static void g_cclosure_user_marshal_VOID__STRING_INT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
 static void user_interface_finalize (UserInterface* obj);
 #define PROGRESS_BAR_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PROGRESS_BAR_DIALOG, ProgressBarDialogPrivate))
 enum  {
@@ -459,39 +498,66 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify
 
 
 static void _user_interface_page_removed_cb_book_page_removed (Book* _sender, Page* page, gpointer self) {
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_removed_cb (self, _sender, page);
+#line 504 "ui.c"
 }
 
 
 static void _user_interface_page_added_cb_book_page_added (Book* _sender, Page* page, gpointer self) {
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_added_cb (self, _sender, page);
+#line 511 "ui.c"
 }
 
 
 UserInterface* user_interface_construct (GType object_type) {
 	UserInterface* self = NULL;
-	Book* _tmp0_;
+	GSettings* _tmp0_;
 	Book* _tmp1_;
 	Book* _tmp2_;
-	GSettings* _tmp3_;
+	Book* _tmp3_;
+	AutosaveManager* _tmp4_ = NULL;
+#line 102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (UserInterface*) g_type_create_instance (object_type);
-	_tmp0_ = book_new ();
+#line 104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = g_settings_new ("org.gnome.SimpleScan");
+#line 104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->settings);
+#line 104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->settings = _tmp0_;
+#line 106 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = book_new ();
+#line 106 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_book_unref0 (self->priv->book);
-	self->priv->book = _tmp0_;
-	_tmp1_ = self->priv->book;
-	g_signal_connect (_tmp1_, "page-removed", (GCallback) _user_interface_page_removed_cb_book_page_removed, self);
+#line 106 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->book = _tmp1_;
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = self->priv->book;
-	g_signal_connect (_tmp2_, "page-added", (GCallback) _user_interface_page_added_cb_book_page_added, self);
-	_tmp3_ = g_settings_new ("org.gnome.SimpleScan");
-	_g_object_unref0 (self->priv->settings);
-	self->priv->settings = _tmp3_;
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect (_tmp2_, "page-removed", (GCallback) _user_interface_page_removed_cb_book_page_removed, self);
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = self->priv->book;
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect (_tmp3_, "page-added", (GCallback) _user_interface_page_added_cb_book_page_added, self);
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_load (self);
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp4_ = autosave_manager_create (&self->priv->book);
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_autosave_manager_unref0 (self->priv->autosave_manager);
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->autosave_manager = _tmp4_;
+#line 102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self;
+#line 554 "ui.c"
 }
 
 
 UserInterface* user_interface_new (void) {
+#line 102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return user_interface_construct (TYPE_USER_INTERFACE);
+#line 561 "ui.c"
 }
 
 
@@ -502,61 +568,105 @@ static gboolean user_interface_find_scan_device (UserInterface* self, const gcha
 	GtkListStore* _tmp0_;
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
+#line 121 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
+#line 121 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (device != NULL, FALSE);
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	have_iter = FALSE;
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->device_model;
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp0_, &_tmp1_);
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_iter = _tmp1_;
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
+#line 586 "ui.c"
 		{
 			gboolean _tmp3_;
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp3_ = TRUE;
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			while (TRUE) {
+#line 593 "ui.c"
 				gboolean _tmp4_;
 				gchar* d = NULL;
 				GtkListStore* _tmp10_;
 				GtkTreeIter _tmp11_;
 				const gchar* _tmp12_;
 				const gchar* _tmp13_;
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp4_ = _tmp3_;
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (!_tmp4_) {
+#line 604 "ui.c"
 					gboolean _tmp5_ = FALSE;
 					gboolean _tmp6_;
 					gboolean _tmp9_;
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp6_ = have_iter;
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					if (!_tmp6_) {
+#line 612 "ui.c"
 						GtkListStore* _tmp7_;
 						gboolean _tmp8_ = FALSE;
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp7_ = self->priv->device_model;
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp8_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp7_, &_vala_iter);
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp5_ = _tmp8_;
+#line 621 "ui.c"
 					} else {
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp5_ = FALSE;
+#line 625 "ui.c"
 					}
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp9_ = _tmp5_;
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					if (!_tmp9_) {
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
+#line 633 "ui.c"
 					}
 				}
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp3_ = FALSE;
+#line 130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp10_ = self->priv->device_model;
+#line 130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp11_ = _vala_iter;
+#line 130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				gtk_tree_model_get ((GtkTreeModel*) _tmp10_, &_tmp11_, 0, &d, -1, -1);
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp12_ = d;
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp13_ = device;
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (g_strcmp0 (_tmp12_, _tmp13_) == 0) {
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					have_iter = TRUE;
+#line 652 "ui.c"
 				}
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (d);
+#line 656 "ui.c"
 			}
 		}
 	}
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = have_iter;
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (iter) {
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*iter = _vala_iter;
+#line 666 "ui.c"
 	}
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
+#line 670 "ui.c"
 }
 
 
@@ -566,31 +676,52 @@ static void user_interface_show_error_dialog (UserInterface* self, const gchar*
 	GtkMessageDialog* _tmp2_;
 	GtkMessageDialog* dialog;
 	const gchar* _tmp3_;
+#line 139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (error_title != NULL);
+#line 139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (error_text != NULL);
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->window;
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = error_title;
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s", _tmp1_);
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp2_);
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	dialog = _tmp2_;
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_dialog_add_button ((GtkDialog*) dialog, GTK_STOCK_CLOSE, 0);
+#line 147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = error_text;
+#line 147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_message_dialog_format_secondary_text (dialog, "%s", _tmp3_);
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) dialog);
+#line 139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (dialog);
+#line 706 "ui.c"
 }
 
 
 void user_interface_set_default_file_name (UserInterface* self, const gchar* default_file_name) {
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
+#line 151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (default_file_name != NULL);
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = default_file_name;
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_strdup (_tmp0_);
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->default_file_name);
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_file_name = _tmp1_;
+#line 725 "ui.c"
 }
 
 
@@ -613,57 +744,104 @@ void user_interface_authorize (UserInterface* self, const gchar* resource, gchar
 	GtkEntry* _tmp12_;
 	const gchar* _tmp13_ = NULL;
 	gchar* _tmp14_;
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (resource != NULL);
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = _ ("Username and password required to access '%s'");
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = resource;
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = g_strdup_printf (_tmp0_, _tmp1_);
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	description = _tmp2_;
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->username_entry;
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_entry_set_text (_tmp3_, "");
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->password_entry;
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_entry_set_text (_tmp4_, "");
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = self->priv->authorize_label;
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_label_set_text (_tmp5_, description);
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = self->priv->authorize_dialog;
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_show ((GtkWidget*) _tmp6_);
+#line 166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = self->priv->authorize_dialog;
+#line 166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_dialog_run (_tmp7_);
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = self->priv->authorize_dialog;
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_hide ((GtkWidget*) _tmp8_);
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = self->priv->username_entry;
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = gtk_entry_get_text (_tmp9_);
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = g_strdup (_tmp10_);
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (_vala_username);
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_username = _tmp11_;
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = self->priv->password_entry;
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = gtk_entry_get_text (_tmp12_);
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = g_strdup (_tmp13_);
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (_vala_password);
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_password = _tmp14_;
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (description);
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (username) {
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*username = _vala_username;
+#line 810 "ui.c"
 	} else {
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_vala_username);
+#line 814 "ui.c"
 	}
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (password) {
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*password = _vala_password;
+#line 820 "ui.c"
 	} else {
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_vala_password);
+#line 824 "ui.c"
 	}
 }
 
 
 void G_MODULE_EXPORT device_combo_changed_cb (GtkWidget* widget, UserInterface* self) {
 	gboolean _tmp0_;
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->setting_devices;
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
+#line 177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
+#line 841 "ui.c"
 	}
+#line 178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->user_selected_device = TRUE;
+#line 845 "ui.c"
 }
 
 
@@ -690,95 +868,169 @@ static void user_interface_update_info_bar (UserInterface* self) {
 	GtkButton* _tmp26_;
 	gboolean _tmp27_;
 	GtkInfoBar* _tmp28_;
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	show_close_button = FALSE;
+#line 186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	show_change_scanner_button = FALSE;
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->have_error;
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
+#line 882 "ui.c"
 		gchar* _tmp1_;
 		const gchar* _tmp2_;
 		gchar* _tmp3_;
 		const gchar* _tmp4_;
 		gchar* _tmp5_;
 		gboolean _tmp6_;
+#line 190 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		type = GTK_MESSAGE_ERROR;
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = g_strdup (GTK_STOCK_DIALOG_ERROR);
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (image_id);
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		image_id = _tmp1_;
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = self->priv->error_title;
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = g_strdup (_tmp2_);
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (title);
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		title = _tmp3_;
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = self->priv->error_text;
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = g_strdup (_tmp4_);
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (text);
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		text = _tmp5_;
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		show_close_button = TRUE;
+#line 195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = self->priv->error_change_scanner_hint;
+#line 195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		show_change_scanner_button = _tmp6_;
+#line 919 "ui.c"
 	} else {
 		GtkListStore* _tmp7_;
 		gint _tmp8_ = 0;
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = self->priv->device_model;
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = gtk_tree_model_iter_n_children ((GtkTreeModel*) _tmp7_, NULL);
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp8_ == 0) {
+#line 929 "ui.c"
 			gchar* _tmp9_;
 			const gchar* _tmp10_ = NULL;
 			gchar* _tmp11_;
 			const gchar* _tmp12_ = NULL;
 			gchar* _tmp13_;
+#line 199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			type = GTK_MESSAGE_WARNING;
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp9_ = g_strdup (GTK_STOCK_DIALOG_WARNING);
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (image_id);
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			image_id = _tmp9_;
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp10_ = _ ("No scanners detected");
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp11_ = g_strdup (_tmp10_);
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (title);
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			title = _tmp11_;
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp12_ = _ ("Please check your scanner is connected and powered on");
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp13_ = g_strdup (_tmp12_);
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (text);
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			text = _tmp13_;
+#line 959 "ui.c"
 		} else {
 			GtkInfoBar* _tmp14_;
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp14_ = self->priv->info_bar;
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_widget_hide ((GtkWidget*) _tmp14_);
+#line 209 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (image_id);
+#line 209 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (text);
+#line 209 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (title);
+#line 209 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			return;
+#line 974 "ui.c"
 		}
 	}
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = self->priv->info_bar;
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = type;
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_info_bar_set_message_type (_tmp15_, _tmp16_);
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = self->priv->info_bar_image;
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = image_id;
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_image_set_from_stock (_tmp17_, _tmp18_, GTK_ICON_SIZE_DIALOG);
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = title;
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = text;
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp21_ = g_strdup_printf ("<big><b>%s</b></big>\n\n%s", _tmp19_, _tmp20_);
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	message = _tmp21_;
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp22_ = self->priv->info_bar_label;
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp23_ = message;
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_label_set_markup (_tmp22_, _tmp23_);
+#line 216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp24_ = self->priv->info_bar_close_button;
+#line 216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp25_ = show_close_button;
+#line 216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp24_, _tmp25_);
+#line 217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp26_ = self->priv->info_bar_change_scanner_button;
+#line 217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp27_ = show_change_scanner_button;
+#line 217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp26_, _tmp27_);
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp28_ = self->priv->info_bar;
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_show ((GtkWidget*) _tmp28_);
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (message);
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (image_id);
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (text);
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (title);
+#line 1027 "ui.c"
 }
 
 
 static gpointer _scan_device_ref0 (gpointer self) {
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self ? scan_device_ref (self) : NULL;
+#line 1034 "ui.c"
 }
 
 
@@ -791,28 +1043,47 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices) {
 	gboolean _tmp52_ = FALSE;
 	gboolean _tmp53_;
 	gboolean _tmp55_;
+#line 221 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	have_selection = FALSE;
+#line 227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->setting_devices = TRUE;
+#line 230 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->user_selected_device;
+#line 230 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
+#line 1057 "ui.c"
 		GtkComboBox* _tmp1_;
 		gint _tmp2_ = 0;
+#line 231 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = self->priv->device_combo;
+#line 231 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = gtk_combo_box_get_active (_tmp1_);
+#line 231 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		have_selection = _tmp2_ >= 0;
+#line 1066 "ui.c"
 	}
+#line 234 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	index = 0;
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = devices;
+#line 1072 "ui.c"
 	{
 		GList* device_collection = NULL;
 		GList* device_it = NULL;
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		device_collection = _tmp3_;
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		for (device_it = device_collection; device_it != NULL; device_it = device_it->next) {
+#line 1080 "ui.c"
 			ScanDevice* _tmp4_;
 			ScanDevice* device = NULL;
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp4_ = _scan_device_ref0 ((ScanDevice*) device_it->data);
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			device = _tmp4_;
+#line 1087 "ui.c"
 			{
 				gint n_delete;
 				GtkListStore* _tmp5_;
@@ -821,18 +1092,30 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices) {
 				gboolean _tmp8_ = FALSE;
 				gint _tmp21_;
 				gint _tmp45_;
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				n_delete = -1;
+#line 240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp5_ = self->priv->device_model;
+#line 240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp6_ = index;
+#line 240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp8_ = gtk_tree_model_iter_nth_child ((GtkTreeModel*) _tmp5_, &_tmp7_, NULL, _tmp6_);
+#line 240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				iter = _tmp7_;
+#line 240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp8_) {
+#line 1108 "ui.c"
 					gint i;
+#line 242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					i = 0;
+#line 1112 "ui.c"
 					{
 						gboolean _tmp9_;
+#line 243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp9_ = TRUE;
+#line 243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						while (TRUE) {
+#line 1119 "ui.c"
 							gboolean _tmp10_;
 							gchar* name = NULL;
 							gboolean matched = FALSE;
@@ -843,55 +1126,96 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices) {
 							const gchar* _tmp17_;
 							gboolean _tmp18_;
 							gint _tmp20_;
+#line 243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp10_ = _tmp9_;
+#line 243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							if (!_tmp10_) {
+#line 1134 "ui.c"
 								GtkListStore* _tmp11_;
 								gboolean _tmp12_ = FALSE;
+#line 257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp11_ = self->priv->device_model;
+#line 257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp12_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp11_, &iter);
+#line 257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								if (!_tmp12_) {
+#line 257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 									break;
+#line 1145 "ui.c"
 								}
 							}
+#line 243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp9_ = FALSE;
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp13_ = self->priv->device_model;
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp14_ = iter;
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							gtk_tree_model_get ((GtkTreeModel*) _tmp13_, &_tmp14_, 0, &name, -1, -1);
+#line 249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp15_ = name;
+#line 249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp16_ = device;
+#line 249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp17_ = _tmp16_->name;
+#line 249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							matched = g_strcmp0 (_tmp15_, _tmp17_) == 0;
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp18_ = matched;
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							if (_tmp18_) {
+#line 1168 "ui.c"
 								gint _tmp19_;
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp19_ = i;
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								n_delete = _tmp19_;
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_g_free0 (name);
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								break;
+#line 1178 "ui.c"
 							}
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp20_ = i;
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							i = _tmp20_ + 1;
+#line 243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_g_free0 (name);
+#line 1186 "ui.c"
 						}
 					}
 				}
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp21_ = n_delete;
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp21_ >= 0) {
+#line 1194 "ui.c"
 					gint i = 0;
 					GtkListStore* _tmp22_;
 					GtkTreeIter _tmp23_;
 					ScanDevice* _tmp24_;
 					const gchar* _tmp25_;
+#line 266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp22_ = self->priv->device_model;
+#line 266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp23_ = iter;
+#line 266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp24_ = device;
+#line 266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp25_ = _tmp24_->label;
+#line 266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_list_store_set (_tmp22_, &_tmp23_, 1, _tmp25_, -1, -1);
+#line 1210 "ui.c"
 					{
 						gboolean _tmp26_;
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						i = 0;
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp26_ = TRUE;
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						while (TRUE) {
+#line 1219 "ui.c"
 							gboolean _tmp27_;
 							gint _tmp29_;
 							gint _tmp30_;
@@ -900,25 +1224,45 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices) {
 							GtkTreeIter _tmp33_ = {0};
 							GtkListStore* _tmp34_;
 							GtkTreeIter _tmp35_;
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp27_ = _tmp26_;
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							if (!_tmp27_) {
+#line 1232 "ui.c"
 								gint _tmp28_;
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp28_ = i;
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								i = _tmp28_ + 1;
+#line 1238 "ui.c"
 							}
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp26_ = FALSE;
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp29_ = i;
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp30_ = n_delete;
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							if (!(_tmp29_ < _tmp30_)) {
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								break;
+#line 1250 "ui.c"
 							}
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp31_ = self->priv->device_model;
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp32_ = index;
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							gtk_tree_model_iter_nth_child ((GtkTreeModel*) _tmp31_, &_tmp33_, NULL, _tmp32_);
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							iter = _tmp33_;
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp34_ = self->priv->device_model;
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp35_ = iter;
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							gtk_list_store_remove (_tmp34_, &_tmp35_);
+#line 1266 "ui.c"
 						}
 					}
 				} else {
@@ -931,58 +1275,104 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices) {
 					const gchar* _tmp42_;
 					ScanDevice* _tmp43_;
 					const gchar* _tmp44_;
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp36_ = self->priv->device_model;
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp37_ = index;
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_list_store_insert (_tmp36_, &_tmp38_, _tmp37_);
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					iter = _tmp38_;
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp39_ = self->priv->device_model;
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp40_ = iter;
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp41_ = device;
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp42_ = _tmp41_->name;
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp43_ = device;
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp44_ = _tmp43_->label;
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_list_store_set (_tmp39_, &_tmp40_, 0, _tmp42_, 1, _tmp44_, -1, -1);
+#line 1301 "ui.c"
 				}
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp45_ = index;
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				index = _tmp45_ + 1;
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_scan_device_unref0 (device);
+#line 1309 "ui.c"
 			}
 		}
 	}
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	while (TRUE) {
+#line 1315 "ui.c"
 		GtkListStore* _tmp46_;
 		gint _tmp47_;
 		GtkTreeIter _tmp48_ = {0};
 		gboolean _tmp49_ = FALSE;
 		GtkListStore* _tmp50_;
 		GtkTreeIter _tmp51_;
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp46_ = self->priv->device_model;
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp47_ = index;
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp49_ = gtk_tree_model_iter_nth_child ((GtkTreeModel*) _tmp46_, &_tmp48_, NULL, _tmp47_);
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		iter = _tmp48_;
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (!_tmp49_) {
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
+#line 1334 "ui.c"
 		}
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp50_ = self->priv->device_model;
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp51_ = iter;
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_list_store_remove (_tmp50_, &_tmp51_);
+#line 1342 "ui.c"
 	}
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp53_ = have_selection;
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp53_) {
+#line 1348 "ui.c"
 		GList* _tmp54_;
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp54_ = devices;
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp52_ = _tmp54_ != NULL;
+#line 1354 "ui.c"
 	} else {
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp52_ = FALSE;
+#line 1358 "ui.c"
 	}
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp55_ = _tmp52_;
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp55_) {
+#line 1364 "ui.c"
 		GtkComboBox* _tmp56_;
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp56_ = self->priv->device_combo;
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_combo_box_set_active (_tmp56_, 0);
+#line 1370 "ui.c"
 	}
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->setting_devices = FALSE;
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_info_bar (self);
+#line 1376 "ui.c"
 }
 
 
@@ -992,22 +1382,37 @@ static gchar* user_interface_get_selected_device (UserInterface* self) {
 	GtkComboBox* _tmp0_;
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
+#line 299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->device_combo;
+#line 299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_combo_box_get_active_iter (_tmp0_, &_tmp1_);
+#line 299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp1_;
+#line 299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
+#line 1396 "ui.c"
 		gchar* device = NULL;
 		GtkListStore* _tmp3_;
 		GtkTreeIter _tmp4_;
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->device_model;
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = iter;
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get ((GtkTreeModel*) _tmp3_, &_tmp4_, 0, &device, -1, -1);
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = device;
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
+#line 1410 "ui.c"
 	}
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = NULL;
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
+#line 1416 "ui.c"
 }
 
 
@@ -1018,18 +1423,31 @@ void user_interface_set_selected_device (UserInterface* self, const gchar* devic
 	gboolean _tmp2_ = FALSE;
 	GtkComboBox* _tmp3_;
 	GtkTreeIter _tmp4_;
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (device != NULL);
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = device;
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = user_interface_find_scan_device (self, _tmp0_, &_tmp1_);
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp1_;
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp2_) {
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
+#line 1441 "ui.c"
 	}
+#line 315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->device_combo;
+#line 315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = iter;
+#line 315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_combo_box_set_active_iter (_tmp3_, &_tmp4_);
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->user_selected_device = TRUE;
+#line 1451 "ui.c"
 }
 
 
@@ -1042,22 +1460,29 @@ static void user_interface_add_default_page (UserInterface* self) {
 	Page* _tmp5_ = NULL;
 	Page* page;
 	BookView* _tmp6_;
+#line 319 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book;
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->default_page_width;
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = self->priv->default_page_height;
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->default_page_dpi;
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->default_page_scan_direction;
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = book_append_page (_tmp0_, _tmp1_, _tmp2_, _tmp3_, _tmp4_);
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp5_;
+#line 325 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = self->priv->book_view;
+#line 325 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_view_select_page (_tmp6_, page);
+#line 319 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-}
-
-
-static gpointer _g_object_ref0 (gpointer self) {
-	return self ? g_object_ref (self) : NULL;
+#line 1486 "ui.c"
 }
 
 
@@ -1068,20 +1493,35 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start
 	gchar* _tmp2_ = NULL;
 	gchar* _result_;
 	gchar* _tmp3_;
+#line 928 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
+#line 929 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
+#line 929 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp1_ = c;
+#line 929 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) (-1), _tmp1_);
+#line 929 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
+#line 931 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
+#line 931 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
+#line 1511 "ui.c"
 		gchar* _tmp4_;
+#line 932 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
+#line 932 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
+#line 932 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		return result;
+#line 1519 "ui.c"
 	} else {
+#line 934 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		result = -1;
+#line 934 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		return result;
+#line 1525 "ui.c"
 	}
 }
 
@@ -1105,140 +1545,441 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	glong _tmp21_;
 	glong _tmp22_;
 	gchar* _tmp23_ = NULL;
+#line 1190 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
+#line 1191 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
+#line 1191 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
+#line 1191 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	string_length = (glong) _tmp1_;
+#line 1192 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp2_ = start;
+#line 1192 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
+#line 1561 "ui.c"
 		glong _tmp3_;
 		glong _tmp4_;
+#line 1193 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp3_ = string_length;
+#line 1193 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp4_ = start;
+#line 1193 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
+#line 1570 "ui.c"
 	}
+#line 1195 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
+#line 1195 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
+#line 1576 "ui.c"
 		glong _tmp6_;
 		glong _tmp7_;
+#line 1196 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp6_ = string_length;
+#line 1196 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp7_ = end;
+#line 1196 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
+#line 1585 "ui.c"
 	}
+#line 1198 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
+#line 1198 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
+#line 1591 "ui.c"
 		glong _tmp10_;
 		glong _tmp11_;
+#line 1198 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp10_ = start;
+#line 1198 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp11_ = string_length;
+#line 1198 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
+#line 1600 "ui.c"
 	} else {
+#line 1198 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
+#line 1604 "ui.c"
 	}
+#line 1198 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp12_ = _tmp8_;
+#line 1198 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
+#line 1199 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp14_ = end;
+#line 1199 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	if (_tmp14_ >= ((glong) 0)) {
+#line 1614 "ui.c"
 		glong _tmp15_;
 		glong _tmp16_;
+#line 1199 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp15_ = end;
+#line 1199 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp16_ = string_length;
+#line 1199 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp13_ = _tmp15_ <= _tmp16_;
+#line 1623 "ui.c"
 	} else {
+#line 1199 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 		_tmp13_ = FALSE;
+#line 1627 "ui.c"
 	}
+#line 1199 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp17_ = _tmp13_;
+#line 1199 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp17_, NULL);
+#line 1200 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp18_ = start;
+#line 1200 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp19_ = end;
+#line 1200 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp18_ <= _tmp19_, NULL);
+#line 1201 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp20_ = start;
+#line 1201 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp21_ = end;
+#line 1201 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp22_ = start;
+#line 1201 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	_tmp23_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) (_tmp21_ - _tmp22_));
+#line 1201 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	result = _tmp23_;
+#line 1201 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
 	return result;
+#line 1651 "ui.c"
 }
 
 
 static void user_interface_on_file_type_changed (UserInterface* self, GtkTreeSelection* selection) {
-	GtkTreeModel* model = NULL;
-	GtkTreeIter iter = {0};
 	GtkTreeSelection* _tmp0_;
-	GtkTreeModel* _tmp1_ = NULL;
-	GtkTreeIter _tmp2_ = {0};
-	gboolean _tmp3_ = FALSE;
-	GtkTreeModel* _tmp4_;
-	gchar* extension = NULL;
-	GtkTreeModel* _tmp5_;
-	GtkTreeIter _tmp6_;
-	GtkFileChooserDialog* _tmp7_;
-	gchar* _tmp8_ = NULL;
+	gchar* _tmp1_ = NULL;
+	gchar* extension;
+	GtkFileChooserDialog* _tmp2_;
+	gchar* _tmp3_ = NULL;
 	gchar* path;
-	const gchar* _tmp9_;
-	gchar* _tmp10_ = NULL;
+	const gchar* _tmp4_;
+	gchar* _tmp5_ = NULL;
 	gchar* filename;
-	const gchar* _tmp11_;
-	gint _tmp12_ = 0;
+	const gchar* _tmp6_;
+	gint _tmp7_ = 0;
 	gint extension_index;
-	gint _tmp13_;
-	const gchar* _tmp17_;
-	const gchar* _tmp18_;
-	gchar* _tmp19_;
-	GtkFileChooserDialog* _tmp20_;
-	const gchar* _tmp21_;
+	gint _tmp8_;
+	const gchar* _tmp12_;
+	const gchar* _tmp13_;
+	gchar* _tmp14_;
+	GtkFileChooserDialog* _tmp15_;
+	const gchar* _tmp16_;
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (selection != NULL);
+#line 330 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = selection;
-	_tmp3_ = gtk_tree_selection_get_selected (_tmp0_, &_tmp1_, &_tmp2_);
-	_g_object_unref0 (model);
-	_tmp4_ = _g_object_ref0 (_tmp1_);
-	model = _tmp4_;
-	iter = _tmp2_;
-	if (!_tmp3_) {
-		_g_object_unref0 (model);
-		return;
-	}
-	_tmp5_ = model;
-	_tmp6_ = iter;
-	gtk_tree_model_get (_tmp5_, &_tmp6_, 1, &extension, -1, -1);
-	_tmp7_ = self->priv->save_dialog;
-	_tmp8_ = gtk_file_chooser_get_filename ((GtkFileChooser*) _tmp7_);
-	path = _tmp8_;
-	_tmp9_ = path;
-	_tmp10_ = g_path_get_basename (_tmp9_);
-	filename = _tmp10_;
-	_tmp11_ = filename;
-	_tmp12_ = string_last_index_of_char (_tmp11_, (gunichar) '.', 0);
-	extension_index = _tmp12_;
-	_tmp13_ = extension_index;
-	if (_tmp13_ >= 0) {
-		const gchar* _tmp14_;
-		gint _tmp15_;
-		gchar* _tmp16_ = NULL;
-		_tmp14_ = filename;
-		_tmp15_ = extension_index;
-		_tmp16_ = string_slice (_tmp14_, (glong) 0, (glong) _tmp15_);
+#line 330 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = user_interface_get_selected_extension (self, _tmp0_);
+#line 330 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	extension = _tmp1_;
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = self->priv->save_dialog;
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = gtk_file_chooser_get_filename ((GtkFileChooser*) _tmp2_);
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	path = _tmp3_;
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp4_ = path;
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp5_ = g_path_get_basename (_tmp4_);
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	filename = _tmp5_;
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp6_ = filename;
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp7_ = string_last_index_of_char (_tmp6_, (gunichar) '.', 0);
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	extension_index = _tmp7_;
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp8_ = extension_index;
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp8_ >= 0) {
+#line 1706 "ui.c"
+		const gchar* _tmp9_;
+		gint _tmp10_;
+		gchar* _tmp11_ = NULL;
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp9_ = filename;
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp10_ = extension_index;
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp11_ = string_slice (_tmp9_, (glong) 0, (glong) _tmp10_);
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (filename);
-		filename = _tmp16_;
-	}
-	_tmp17_ = filename;
-	_tmp18_ = extension;
-	_tmp19_ = g_strconcat (_tmp17_, _tmp18_, NULL);
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		filename = _tmp11_;
+#line 1720 "ui.c"
+	}
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp12_ = filename;
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp13_ = extension;
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp14_ = g_strconcat (_tmp12_, _tmp13_, NULL);
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (filename);
-	filename = _tmp19_;
-	_tmp20_ = self->priv->save_dialog;
-	_tmp21_ = filename;
-	gtk_file_chooser_set_current_name ((GtkFileChooser*) _tmp20_, _tmp21_);
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	filename = _tmp14_;
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp15_ = self->priv->save_dialog;
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp16_ = filename;
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_file_chooser_set_current_name ((GtkFileChooser*) _tmp15_, _tmp16_);
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (filename);
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (path);
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (extension);
+#line 1744 "ui.c"
+}
+
+
+static gpointer _g_object_ref0 (gpointer self) {
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return self ? g_object_ref (self) : NULL;
+#line 1751 "ui.c"
+}
+
+
+static gchar* user_interface_get_selected_extension (UserInterface* self, GtkTreeSelection* selection) {
+	gchar* result = NULL;
+	GtkTreeModel* model = NULL;
+	GtkTreeIter iter = {0};
+	gchar* _tmp0_;
+	gchar* extension;
+	GtkTreeSelection* _tmp1_;
+	GtkTreeModel* _tmp2_ = NULL;
+	GtkTreeIter _tmp3_ = {0};
+	gboolean _tmp4_ = FALSE;
+	GtkTreeModel* _tmp5_;
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (self != NULL, NULL);
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (selection != NULL, NULL);
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = g_strdup ("");
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	extension = _tmp0_;
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = selection;
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp4_ = gtk_tree_selection_get_selected (_tmp1_, &_tmp2_, &_tmp3_);
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (model);
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp5_ = _g_object_ref0 (_tmp2_);
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	model = _tmp5_;
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp3_;
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp4_) {
+#line 1788 "ui.c"
+		GtkTreeModel* _tmp6_;
+		GtkTreeIter _tmp7_;
+#line 349 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp6_ = model;
+#line 349 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp7_ = iter;
+#line 349 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_tree_model_get (_tmp6_, &_tmp7_, 1, &extension, -1, -1);
+#line 1797 "ui.c"
+	}
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	result = extension;
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (model);
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return result;
+#line 1805 "ui.c"
+}
+
+
+static glong string_strnlen (gchar* str, glong maxlen) {
+	glong result = 0L;
+	gchar* _tmp0_;
+	glong _tmp1_;
+	gchar* _tmp2_ = NULL;
+	gchar* end;
+	gchar* _tmp3_;
+#line 1157 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+	_tmp0_ = str;
+#line 1157 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+	_tmp1_ = maxlen;
+#line 1157 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
+#line 1157 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+	end = _tmp2_;
+#line 1158 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+	_tmp3_ = end;
+#line 1158 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+	if (_tmp3_ == NULL) {
+#line 1828 "ui.c"
+		glong _tmp4_;
+#line 1159 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+		_tmp4_ = maxlen;
+#line 1159 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+		result = _tmp4_;
+#line 1159 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+		return result;
+#line 1836 "ui.c"
+	} else {
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+#line 1161 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+		_tmp5_ = end;
+#line 1161 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+		_tmp6_ = str;
+#line 1161 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+		result = (glong) (_tmp5_ - _tmp6_);
+#line 1161 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+		return result;
+#line 1848 "ui.c"
+	}
+}
+
+
+static gchar* string_substring (const gchar* self, glong offset, glong len) {
+	gchar* result = NULL;
+	glong string_length = 0L;
+	gboolean _tmp0_ = FALSE;
+	glong _tmp1_;
+	gboolean _tmp3_;
+	glong _tmp9_;
+	glong _tmp15_;
+	glong _tmp18_;
+	glong _tmp19_;
+	glong _tmp20_;
+	glong _tmp21_;
+	glong _tmp22_;
+	gchar* _tmp23_ = NULL;
+#line 1168 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (self != NULL, NULL);
+#line 1170 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+	_tmp1_ = offset;
+#line 1170 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+	if (_tmp1_ >= ((glong) 0)) {
+#line 1873 "ui.c"
+		glong _tmp2_;
+#line 1170 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+		_tmp2_ = len;
+#line 1170 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+		_tmp0_ = _tmp2_ >= ((glong) 0);
+#line 1879 "ui.c"
+	} else {
+#line 1170 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+		_tmp0_ = FALSE;
+#line 1883 "ui.c"
+	}
+#line 1170 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+	_tmp3_ = _tmp0_;
+#line 1170 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+	if (_tmp3_) {
+#line 1889 "ui.c"
+		glong _tmp4_;
+		glong _tmp5_;
+		glong _tmp6_ = 0L;
+#line 1172 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+		_tmp4_ = offset;
+#line 1172 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+		_tmp5_ = len;
+#line 1172 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+		_tmp6_ = string_strnlen ((gchar*) self, _tmp4_ + _tmp5_);
+#line 1172 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+		string_length = _tmp6_;
+#line 1901 "ui.c"
+	} else {
+		gint _tmp7_;
+		gint _tmp8_;
+#line 1174 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+		_tmp7_ = strlen (self);
+#line 1174 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+		_tmp8_ = _tmp7_;
+#line 1174 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+		string_length = (glong) _tmp8_;
+#line 1911 "ui.c"
+	}
+#line 1177 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+	_tmp9_ = offset;
+#line 1177 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+	if (_tmp9_ < ((glong) 0)) {
+#line 1917 "ui.c"
+		glong _tmp10_;
+		glong _tmp11_;
+		glong _tmp12_;
+#line 1178 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+		_tmp10_ = string_length;
+#line 1178 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+		_tmp11_ = offset;
+#line 1178 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+		offset = _tmp10_ + _tmp11_;
+#line 1179 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+		_tmp12_ = offset;
+#line 1179 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+		g_return_val_if_fail (_tmp12_ >= ((glong) 0), NULL);
+#line 1931 "ui.c"
+	} else {
+		glong _tmp13_;
+		glong _tmp14_;
+#line 1181 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+		_tmp13_ = offset;
+#line 1181 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+		_tmp14_ = string_length;
+#line 1181 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+		g_return_val_if_fail (_tmp13_ <= _tmp14_, NULL);
+#line 1941 "ui.c"
+	}
+#line 1183 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+	_tmp15_ = len;
+#line 1183 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+	if (_tmp15_ < ((glong) 0)) {
+#line 1947 "ui.c"
+		glong _tmp16_;
+		glong _tmp17_;
+#line 1184 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+		_tmp16_ = string_length;
+#line 1184 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+		_tmp17_ = offset;
+#line 1184 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+		len = _tmp16_ - _tmp17_;
+#line 1956 "ui.c"
+	}
+#line 1186 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+	_tmp18_ = offset;
+#line 1186 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+	_tmp19_ = len;
+#line 1186 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+	_tmp20_ = string_length;
+#line 1186 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+	g_return_val_if_fail ((_tmp18_ + _tmp19_) <= _tmp20_, NULL);
+#line 1187 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+	_tmp21_ = offset;
+#line 1187 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+	_tmp22_ = len;
+#line 1187 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+	_tmp23_ = g_strndup (((gchar*) self) + _tmp21_, (gsize) _tmp22_);
+#line 1187 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+	result = _tmp23_;
+#line 1187 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+	return result;
+#line 1976 "ui.c"
 }
 
 
 static void _user_interface_on_file_type_changed_gtk_tree_selection_changed (GtkTreeSelection* _sender, gpointer self) {
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_on_file_type_changed (self, _sender);
+#line 1983 "ui.c"
 }
 
 
@@ -1280,7 +2021,7 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 	GtkFileChooserDialog* _tmp33_;
 	GtkExpander* _tmp34_;
 	gchar* _tmp35_;
-	gchar* extension;
+	gchar* default_extension;
 	const gchar* _tmp36_;
 	gint _tmp37_ = 0;
 	gint index;
@@ -1328,232 +2069,519 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 	gint response;
 	gchar* uri;
 	gint _tmp89_;
-	GSettings* _tmp92_;
-	GtkFileChooserDialog* _tmp93_;
-	gchar* _tmp94_ = NULL;
-	gchar* _tmp95_;
-	GtkTreeView* _tmp96_;
-	GtkTreeSelection* _tmp97_ = NULL;
-	guint _tmp98_ = 0U;
-	GtkFileChooserDialog* _tmp99_;
+	GSettings* _tmp109_;
+	GtkFileChooserDialog* _tmp110_;
+	gchar* _tmp111_ = NULL;
+	gchar* _tmp112_;
+	GtkTreeView* _tmp113_;
+	GtkTreeSelection* _tmp114_ = NULL;
+	guint _tmp115_ = 0U;
+	GtkFileChooserDialog* _tmp116_;
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
+#line 356 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	directory = NULL;
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_settings_get_string (_tmp0_, "save-directory");
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (directory);
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	directory = _tmp1_;
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = directory;
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_ == NULL) {
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = TRUE;
+#line 2099 "ui.c"
 	} else {
 		const gchar* _tmp4_;
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = directory;
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = g_strcmp0 (_tmp4_, "") == 0;
+#line 2106 "ui.c"
 	}
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _tmp2_;
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp5_) {
+#line 2112 "ui.c"
 		const gchar* _tmp6_ = NULL;
 		gchar* _tmp7_;
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS);
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = g_strdup (_tmp6_);
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (directory);
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		directory = _tmp7_;
+#line 2123 "ui.c"
 	}
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = _ ("Save As...");
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = self->priv->window;
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_tmp8_, _tmp9_, GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL, NULL);
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp10_);
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->save_dialog);
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->save_dialog = _tmp10_;
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = self->priv->save_dialog;
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_chooser_set_do_overwrite_confirmation ((GtkFileChooser*) _tmp11_, TRUE);
+#line 370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = self->priv->save_dialog;
+#line 370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_chooser_set_local_only ((GtkFileChooser*) _tmp12_, FALSE);
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = self->priv->save_dialog;
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = directory;
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_chooser_set_current_folder ((GtkFileChooser*) _tmp13_, _tmp14_);
+#line 372 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = self->priv->save_dialog;
+#line 372 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = self->priv->default_file_name;
+#line 372 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_chooser_set_current_name ((GtkFileChooser*) _tmp15_, _tmp16_);
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = gtk_file_filter_new ();
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp17_);
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	filter = _tmp17_;
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = filter;
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = _ ("Image Files");
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_filter_set_name (_tmp18_, _tmp19_);
+#line 378 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = filter;
+#line 378 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_filter_add_pixbuf_formats (_tmp20_);
+#line 379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp21_ = filter;
+#line 379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_filter_add_mime_type (_tmp21_, "application/pdf");
+#line 380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp22_ = self->priv->save_dialog;
+#line 380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp23_ = filter;
+#line 380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_chooser_add_filter ((GtkFileChooser*) _tmp22_, _tmp23_);
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp24_ = gtk_file_filter_new ();
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp24_);
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (filter);
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	filter = _tmp24_;
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp25_ = filter;
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp26_ = _ ("All Files");
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_filter_set_name (_tmp25_, _tmp26_);
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp27_ = filter;
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_filter_add_pattern (_tmp27_, "*");
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp28_ = self->priv->save_dialog;
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp29_ = filter;
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_chooser_add_filter ((GtkFileChooser*) _tmp28_, _tmp29_);
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp30_ = _ ("Select File _Type");
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp31_ = (GtkExpander*) gtk_expander_new_with_mnemonic (_tmp30_);
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp31_);
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	expander = _tmp31_;
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp32_ = expander;
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_expander_set_spacing (_tmp32_, 5);
+#line 390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp33_ = self->priv->save_dialog;
+#line 390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp34_ = expander;
+#line 390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_chooser_set_extra_widget ((GtkFileChooser*) _tmp33_, (GtkWidget*) _tmp34_);
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp35_ = g_strdup ("");
-	extension = _tmp35_;
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	default_extension = _tmp35_;
+#line 393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp36_ = self->priv->default_file_name;
+#line 393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp37_ = string_last_index_of_char (_tmp36_, (gunichar) '.', 0);
+#line 393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	index = _tmp37_;
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp38_ = index;
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp38_ >= 0) {
+#line 2239 "ui.c"
 		const gchar* _tmp39_;
 		gint _tmp40_;
 		gchar* _tmp41_ = NULL;
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp39_ = self->priv->default_file_name;
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp40_ = index;
-		_tmp41_ = string_slice (_tmp39_, (glong) 0, (glong) _tmp40_);
-		_g_free0 (extension);
-		extension = _tmp41_;
-	}
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp41_ = string_substring (_tmp39_, (glong) _tmp40_, (glong) (-1));
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_free0 (default_extension);
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		default_extension = _tmp41_;
+#line 2253 "ui.c"
+	}
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp42_ = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	file_type_store = _tmp42_;
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp43_ = file_type_store;
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp43_, &_tmp44_);
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp44_;
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp45_ = file_type_store;
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp46_ = iter;
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp47_ = _ ("PDF (multi-page document)");
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_set (_tmp45_, &_tmp46_, 0, _tmp47_, 1, ".pdf", -1, -1);
+#line 405 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp48_ = file_type_store;
+#line 405 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp48_, &_tmp49_);
+#line 405 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp49_;
+#line 406 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp50_ = file_type_store;
+#line 406 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp51_ = iter;
+#line 406 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp52_ = _ ("JPEG (compressed)");
+#line 406 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_set (_tmp50_, &_tmp51_, 0, _tmp52_, 1, ".jpg", -1, -1);
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp53_ = file_type_store;
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp53_, &_tmp54_);
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp54_;
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp55_ = file_type_store;
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp56_ = iter;
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp57_ = _ ("PNG (lossless)");
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_set (_tmp55_, &_tmp56_, 0, _tmp57_, 1, ".png", -1, -1);
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp58_ = file_type_store;
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp59_ = (GtkTreeView*) gtk_tree_view_new_with_model ((GtkTreeModel*) _tmp58_);
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp59_);
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	file_type_view = _tmp59_;
+#line 419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp60_ = file_type_view;
+#line 419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_tree_view_set_headers_visible (_tmp60_, FALSE);
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp61_ = file_type_view;
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_tree_view_set_rules_hint (_tmp61_, TRUE);
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp62_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp62_);
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp63_ = _tmp62_;
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp64_ = gtk_tree_view_column_new_with_attributes ("", (GtkCellRenderer*) _tmp63_, "text", 0, NULL, NULL);
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp64_);
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp65_ = _tmp64_;
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (_tmp63_);
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	column = _tmp65_;
+#line 424 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp66_ = file_type_view;
+#line 424 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp67_ = column;
+#line 424 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_tree_view_append_column (_tmp66_, _tmp67_);
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp68_ = expander;
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp69_ = file_type_view;
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_add ((GtkContainer*) _tmp68_, (GtkWidget*) _tmp69_);
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp70_ = file_type_store;
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp72_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp70_, &_tmp71_);
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp71_;
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp72_) {
+#line 2353 "ui.c"
 		{
 			gboolean _tmp73_;
+#line 429 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp73_ = TRUE;
+#line 429 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			while (TRUE) {
+#line 2360 "ui.c"
 				gboolean _tmp74_;
 				gchar* e = NULL;
 				GtkListStore* _tmp77_;
 				GtkTreeIter _tmp78_;
 				const gchar* _tmp79_;
 				const gchar* _tmp80_;
+#line 429 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp74_ = _tmp73_;
+#line 429 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (!_tmp74_) {
+#line 2371 "ui.c"
 					GtkListStore* _tmp75_;
 					gboolean _tmp76_ = FALSE;
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp75_ = file_type_store;
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp76_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp75_, &iter);
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					if (!_tmp76_) {
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
+#line 2382 "ui.c"
 					}
 				}
+#line 429 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp73_ = FALSE;
+#line 432 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp77_ = file_type_store;
+#line 432 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp78_ = iter;
+#line 432 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				gtk_tree_model_get ((GtkTreeModel*) _tmp77_, &_tmp78_, 1, &e, -1, -1);
-				_tmp79_ = extension;
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp79_ = default_extension;
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp80_ = e;
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (g_strcmp0 (_tmp79_, _tmp80_) == 0) {
+#line 2399 "ui.c"
 					GtkTreeView* _tmp81_;
 					GtkTreeSelection* _tmp82_ = NULL;
 					GtkTreeIter _tmp83_;
+#line 434 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp81_ = file_type_view;
+#line 434 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp82_ = gtk_tree_view_get_selection (_tmp81_);
+#line 434 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp83_ = iter;
+#line 434 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_tree_selection_select_iter (_tmp82_, &_tmp83_);
+#line 2411 "ui.c"
 				}
+#line 429 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (e);
+#line 2415 "ui.c"
 			}
 		}
 	}
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp84_ = file_type_view;
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp85_ = gtk_tree_view_get_selection (_tmp84_);
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect (_tmp85_, "changed", (GCallback) _user_interface_on_file_type_changed_gtk_tree_selection_changed, self);
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp86_ = expander;
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_show_all ((GtkWidget*) _tmp86_);
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp87_ = self->priv->save_dialog;
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp88_ = gtk_dialog_run ((GtkDialog*) _tmp87_);
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	response = _tmp88_;
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	uri = NULL;
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp89_ = response;
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp89_ == ((gint) GTK_RESPONSE_ACCEPT)) {
-		GtkFileChooserDialog* _tmp90_;
-		gchar* _tmp91_ = NULL;
-		_tmp90_ = self->priv->save_dialog;
-		_tmp91_ = gtk_file_chooser_get_uri ((GtkFileChooser*) _tmp90_);
+#line 2441 "ui.c"
+		GtkTreeView* _tmp90_;
+		GtkTreeSelection* _tmp91_ = NULL;
+		GtkTreeSelection* _tmp92_;
+		GtkTreeSelection* selection;
+		GtkTreeSelection* _tmp93_;
+		gchar* _tmp94_ = NULL;
+		gchar* extension;
+		GtkFileChooserDialog* _tmp95_;
+		gchar* _tmp96_ = NULL;
+		gchar* path;
+		const gchar* _tmp97_;
+		gchar* _tmp98_ = NULL;
+		gchar* filename;
+		const gchar* _tmp99_;
+		gint _tmp100_ = 0;
+		gint extension_index;
+		gint _tmp101_;
+		const gchar* _tmp105_;
+		GFile* _tmp106_ = NULL;
+		GFile* _tmp107_;
+		gchar* _tmp108_ = NULL;
+#line 446 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp90_ = file_type_view;
+#line 446 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp91_ = gtk_tree_view_get_selection (_tmp90_);
+#line 446 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp92_ = _g_object_ref0 (_tmp91_);
+#line 446 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		selection = _tmp92_;
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp93_ = selection;
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp94_ = user_interface_get_selected_extension (self, _tmp93_);
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		extension = _tmp94_;
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp95_ = self->priv->save_dialog;
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp96_ = gtk_file_chooser_get_filename ((GtkFileChooser*) _tmp95_);
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		path = _tmp96_;
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp97_ = path;
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp98_ = g_path_get_basename (_tmp97_);
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		filename = _tmp98_;
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp99_ = filename;
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp100_ = string_last_index_of_char (_tmp99_, (gunichar) '.', 0);
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		extension_index = _tmp100_;
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp101_ = extension_index;
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		if (_tmp101_ < 0) {
+#line 2499 "ui.c"
+			const gchar* _tmp102_;
+			const gchar* _tmp103_;
+			gchar* _tmp104_;
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp102_ = path;
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp103_ = extension;
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp104_ = g_strconcat (_tmp102_, _tmp103_, NULL);
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_g_free0 (path);
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			path = _tmp104_;
+#line 2513 "ui.c"
+		}
+#line 456 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp105_ = path;
+#line 456 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp106_ = g_file_new_for_path (_tmp105_);
+#line 456 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp107_ = _tmp106_;
+#line 456 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp108_ = g_file_get_uri (_tmp107_);
+#line 456 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri);
-		uri = _tmp91_;
-	}
-	_tmp92_ = self->priv->settings;
-	_tmp93_ = self->priv->save_dialog;
-	_tmp94_ = gtk_file_chooser_get_current_folder ((GtkFileChooser*) _tmp93_);
-	_tmp95_ = _tmp94_;
-	g_settings_set_string (_tmp92_, "save-directory", _tmp95_);
-	_g_free0 (_tmp95_);
-	_tmp96_ = file_type_view;
-	_tmp97_ = gtk_tree_view_get_selection (_tmp96_);
-	g_signal_parse_name ("changed", GTK_TYPE_TREE_SELECTION, &_tmp98_, NULL, FALSE);
-	g_signal_handlers_disconnect_matched (_tmp97_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp98_, 0, NULL, (GCallback) _user_interface_on_file_type_changed_gtk_tree_selection_changed, self);
-	_tmp99_ = self->priv->save_dialog;
-	gtk_widget_destroy ((GtkWidget*) _tmp99_);
+#line 456 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		uri = _tmp108_;
+#line 456 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_object_unref0 (_tmp107_);
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_free0 (filename);
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_free0 (path);
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_free0 (extension);
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_object_unref0 (selection);
+#line 2537 "ui.c"
+	}
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp109_ = self->priv->settings;
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp110_ = self->priv->save_dialog;
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp111_ = gtk_file_chooser_get_current_folder ((GtkFileChooser*) _tmp110_);
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp112_ = _tmp111_;
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_settings_set_string (_tmp109_, "save-directory", _tmp112_);
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_free0 (_tmp112_);
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp113_ = file_type_view;
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp114_ = gtk_tree_view_get_selection (_tmp113_);
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_parse_name ("changed", GTK_TYPE_TREE_SELECTION, &_tmp115_, NULL, FALSE);
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_handlers_disconnect_matched (_tmp114_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp115_, 0, NULL, (GCallback) _user_interface_on_file_type_changed_gtk_tree_selection_changed, self);
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp116_ = self->priv->save_dialog;
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_destroy ((GtkWidget*) _tmp116_);
+#line 463 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->save_dialog);
+#line 463 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->save_dialog = NULL;
+#line 465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = uri;
+#line 465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (column);
+#line 465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (file_type_view);
+#line 465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (file_type_store);
-	_g_free0 (extension);
+#line 465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_free0 (default_extension);
+#line 465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (expander);
+#line 465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (filter);
+#line 465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (directory);
+#line 465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
+#line 2585 "ui.c"
 }
 
 
@@ -1575,164 +2603,292 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 	gchar* format;
 	const gchar* _tmp14_;
 	gboolean _tmp15_ = FALSE;
-	const gchar* _tmp38_;
-	gchar* _tmp39_;
-	Book* _tmp40_;
+	const gchar* _tmp39_;
+	gchar* _tmp40_;
+	Book* _tmp41_;
 	GError * _inner_error_ = NULL;
+#line 468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->book_uri;
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_ != NULL) {
+#line 2617 "ui.c"
 		gboolean _tmp2_;
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = force_choose_location;
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = !_tmp2_;
+#line 2623 "ui.c"
 	} else {
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = FALSE;
+#line 2627 "ui.c"
 	}
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp0_;
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_) {
+#line 2633 "ui.c"
 		const gchar* _tmp4_;
 		gchar* _tmp5_;
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = self->priv->book_uri;
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = g_strdup (_tmp4_);
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri);
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		uri = _tmp5_;
+#line 2644 "ui.c"
 	} else {
 		gchar* _tmp6_ = NULL;
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = user_interface_choose_file_location (self);
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri);
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		uri = _tmp6_;
+#line 2653 "ui.c"
 	}
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = uri;
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp7_ == NULL) {
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = FALSE;
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri);
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
+#line 2665 "ui.c"
 	}
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = uri;
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = g_file_new_for_uri (_tmp8_);
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	file = _tmp9_;
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = uri;
-	g_debug ("ui.vala:452: Saving to '%s'", _tmp10_);
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_debug ("ui.vala:480: Saving to '%s'", _tmp10_);
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = uri;
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = g_utf8_strdown (_tmp11_, (gssize) (-1));
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	uri_lower = _tmp12_;
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = g_strdup ("jpeg");
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	format = _tmp13_;
+#line 484 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = uri_lower;
+#line 484 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = g_str_has_suffix (_tmp14_, ".pdf");
+#line 484 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp15_) {
+#line 2693 "ui.c"
 		gchar* _tmp16_;
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp16_ = g_strdup ("pdf");
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (format);
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		format = _tmp16_;
+#line 2701 "ui.c"
 	} else {
 		const gchar* _tmp17_;
 		gboolean _tmp18_ = FALSE;
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp17_ = uri_lower;
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp18_ = g_str_has_suffix (_tmp17_, ".ps");
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp18_) {
+#line 2711 "ui.c"
 			gchar* _tmp19_;
+#line 487 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp19_ = g_strdup ("ps");
+#line 487 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (format);
+#line 487 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			format = _tmp19_;
+#line 2719 "ui.c"
 		} else {
 			const gchar* _tmp20_;
 			gboolean _tmp21_ = FALSE;
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp20_ = uri_lower;
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp21_ = g_str_has_suffix (_tmp20_, ".png");
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (_tmp21_) {
+#line 2729 "ui.c"
 				gchar* _tmp22_;
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp22_ = g_strdup ("png");
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (format);
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				format = _tmp22_;
+#line 2737 "ui.c"
 			} else {
 				gboolean _tmp23_ = FALSE;
 				const gchar* _tmp24_;
 				gboolean _tmp25_ = FALSE;
 				gboolean _tmp28_;
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp24_ = uri_lower;
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp25_ = g_str_has_suffix (_tmp24_, ".tif");
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp25_) {
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp23_ = TRUE;
+#line 2751 "ui.c"
 				} else {
 					const gchar* _tmp26_;
 					gboolean _tmp27_ = FALSE;
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp26_ = uri_lower;
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp27_ = g_str_has_suffix (_tmp26_, ".tiff");
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp23_ = _tmp27_;
+#line 2761 "ui.c"
 				}
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp28_ = _tmp23_;
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp28_) {
+#line 2767 "ui.c"
 					gchar* _tmp29_;
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp29_ = g_strdup ("tiff");
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_free0 (format);
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					format = _tmp29_;
+#line 2775 "ui.c"
 				}
 			}
 		}
 	}
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_show_progress_dialog (self);
+#line 2782 "ui.c"
 	{
 		Book* _tmp30_;
 		const gchar* _tmp31_;
-		GFile* _tmp32_;
+		gint _tmp32_ = 0;
+		GFile* _tmp33_;
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp30_ = self->priv->book;
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp31_ = format;
-		_tmp32_ = file;
-		book_save (_tmp30_, _tmp31_, _tmp32_, &_inner_error_);
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp32_ = user_interface_get_quality (self);
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp33_ = file;
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		book_save (_tmp30_, _tmp31_, _tmp32_, _tmp33_, &_inner_error_);
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_inner_error_ != NULL) {
-			goto __catch15_g_error;
+#line 2800 "ui.c"
+			goto __catch16_g_error;
 		}
 	}
-	goto __finally15;
-	__catch15_g_error:
+	goto __finally16;
+	__catch16_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp33_;
-		const gchar* _tmp34_;
-		const gchar* _tmp35_ = NULL;
-		GError* _tmp36_;
-		const gchar* _tmp37_;
+		GError* _tmp34_;
+		const gchar* _tmp35_;
+		const gchar* _tmp36_ = NULL;
+		GError* _tmp37_;
+		const gchar* _tmp38_;
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_hide_progress_dialog (self);
-		_tmp33_ = e;
-		_tmp34_ = _tmp33_->message;
-		g_warning ("ui.vala:473: Error saving file: %s", _tmp34_);
-		_tmp35_ = _ ("Failed to save file");
-		_tmp36_ = e;
-		_tmp37_ = _tmp36_->message;
-		user_interface_show_error (self, _tmp35_, _tmp37_, FALSE);
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp34_ = e;
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp35_ = _tmp34_->message;
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_warning ("ui.vala:501: Error saving file: %s", _tmp35_);
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp36_ = _ ("Failed to save file");
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp37_ = e;
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp38_ = _tmp37_->message;
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		user_interface_show_error (self, _tmp36_, _tmp38_, FALSE);
+#line 506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = FALSE;
+#line 506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
+#line 506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (format);
+#line 506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri_lower);
+#line 506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (file);
+#line 506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri);
+#line 506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
+#line 2847 "ui.c"
 	}
-	__finally15:
+	__finally16:
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_inner_error_ != NULL) {
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (format);
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri_lower);
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (file);
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri);
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return FALSE;
+#line 2866 "ui.c"
 	}
-	_tmp38_ = uri;
-	_tmp39_ = g_strdup (_tmp38_);
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp39_ = uri;
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp40_ = g_strdup (_tmp39_);
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->book_uri);
-	self->priv->book_uri = _tmp39_;
-	_tmp40_ = self->priv->book;
-	book_set_needs_saving (_tmp40_, FALSE);
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->book_uri = _tmp40_;
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp41_ = self->priv->book;
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	book_set_needs_saving (_tmp41_, FALSE);
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = TRUE;
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (format);
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (uri_lower);
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (file);
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (uri);
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
+#line 2892 "ui.c"
 }
 
 
@@ -1755,66 +2911,123 @@ static gboolean user_interface_prompt_to_save (UserInterface* self, const gchar*
 	gint response;
 	GtkMessageDialog* _tmp13_;
 	gint _tmp14_;
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (title != NULL, FALSE);
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (discard_label != NULL, FALSE);
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book;
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_get_needs_saving (_tmp0_);
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp1_) {
+#line 517 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = TRUE;
+#line 517 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
+#line 2931 "ui.c"
 	}
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = self->priv->window;
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = title;
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp2_, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s", _tmp3_);
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp4_);
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	dialog = _tmp4_;
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = dialog;
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = _ ("If you don't save, changes will be permanently lost.");
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_message_dialog_format_secondary_text (_tmp5_, "%s", _tmp6_);
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = dialog;
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = discard_label;
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_dialog_add_button ((GtkDialog*) _tmp7_, _tmp8_, (gint) GTK_RESPONSE_NO);
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = dialog;
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_dialog_add_button ((GtkDialog*) _tmp9_, GTK_STOCK_CANCEL, (gint) GTK_RESPONSE_CANCEL);
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = dialog;
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_dialog_add_button ((GtkDialog*) _tmp10_, GTK_STOCK_SAVE, (gint) GTK_RESPONSE_YES);
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = dialog;
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = gtk_dialog_run ((GtkDialog*) _tmp11_);
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	response = _tmp12_;
+#line 532 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = dialog;
+#line 532 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) _tmp13_);
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = response;
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	switch (_tmp14_) {
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case GTK_RESPONSE_YES:
+#line 2979 "ui.c"
 		{
 			gboolean _tmp15_ = FALSE;
+#line 537 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp15_ = user_interface_save_document (self, FALSE);
+#line 537 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (_tmp15_) {
+#line 538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				result = TRUE;
+#line 538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_object_unref0 (dialog);
+#line 538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				return result;
+#line 2992 "ui.c"
 			} else {
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				result = FALSE;
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_object_unref0 (dialog);
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				return result;
+#line 3000 "ui.c"
 			}
 		}
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case GTK_RESPONSE_CANCEL:
+#line 3005 "ui.c"
 		{
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			result = FALSE;
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_object_unref0 (dialog);
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			return result;
+#line 3013 "ui.c"
 		}
 		default:
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case GTK_RESPONSE_NO:
+#line 3018 "ui.c"
 		{
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			result = TRUE;
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_object_unref0 (dialog);
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			return result;
+#line 3026 "ui.c"
 		}
 	}
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (dialog);
+#line 3031 "ui.c"
 }
 
 
@@ -1822,16 +3035,32 @@ static void user_interface_clear_document (UserInterface* self) {
 	Book* _tmp0_;
 	Book* _tmp1_;
 	GtkMenuItem* _tmp2_;
+	GtkMenuItem* _tmp3_;
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book;
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_clear (_tmp0_);
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_add_default_page (self);
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->book_uri);
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->book_uri = NULL;
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->book;
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_set_needs_saving (_tmp1_, FALSE);
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = self->priv->save_as_menuitem;
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp2_, FALSE);
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = self->priv->copy_to_clipboard_menuitem;
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_sensitive ((GtkWidget*) _tmp3_, FALSE);
+#line 3064 "ui.c"
 }
 
 
@@ -1840,19 +3069,33 @@ void G_MODULE_EXPORT new_button_clicked_cb (GtkWidget* widget, UserInterface* se
 	const gchar* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_;
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = _ ("Save current document?");
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _ ("Discard Changes");
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = user_interface_prompt_to_save (self, _tmp0_, _tmp1_);
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp2_) {
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
+#line 3087 "ui.c"
 	}
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->scanning;
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_) {
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_signal_emit_by_name (self, "stop-scan");
+#line 3095 "ui.c"
 	}
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_clear_document (self);
+#line 3099 "ui.c"
 }
 
 
@@ -1860,30 +3103,52 @@ static void user_interface_set_document_hint (UserInterface* self, const gchar*
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
 	const gchar* _tmp2_;
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (document_hint != NULL);
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = document_hint;
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_strdup (_tmp0_);
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->document_hint);
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->document_hint = _tmp1_;
+#line 577 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = document_hint;
+#line 577 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (g_strcmp0 (_tmp2_, "text") == 0) {
+#line 3123 "ui.c"
 		GtkRadioMenuItem* _tmp3_;
 		GtkRadioMenuItem* _tmp4_;
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->text_toolbar_menuitem;
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp3_, TRUE);
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = self->priv->text_menu_menuitem;
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp4_, TRUE);
+#line 3134 "ui.c"
 	} else {
 		const gchar* _tmp5_;
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = document_hint;
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (g_strcmp0 (_tmp5_, "photo") == 0) {
+#line 3141 "ui.c"
 			GtkRadioMenuItem* _tmp6_;
 			GtkRadioMenuItem* _tmp7_;
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp6_ = self->priv->photo_toolbar_menuitem;
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp6_, TRUE);
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp7_ = self->priv->photo_menu_menuitem;
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp7_, TRUE);
+#line 3152 "ui.c"
 		}
 	}
 }
@@ -1892,12 +3157,19 @@ static void user_interface_set_document_hint (UserInterface* self, const gchar*
 void G_MODULE_EXPORT text_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInterface* self) {
 	GtkCheckMenuItem* _tmp0_;
 	gboolean _tmp1_ = FALSE;
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_) {
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_document_hint (self, "text");
+#line 3173 "ui.c"
 	}
 }
 
@@ -1905,12 +3177,19 @@ void G_MODULE_EXPORT text_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInt
 void G_MODULE_EXPORT photo_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInterface* self) {
 	GtkCheckMenuItem* _tmp0_;
 	gboolean _tmp1_ = FALSE;
+#line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_) {
+#line 600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_document_hint (self, "photo");
+#line 3193 "ui.c"
 	}
 }
 
@@ -1920,44 +3199,74 @@ static void user_interface_set_page_side (UserInterface* self, ScanType page_sid
 	GtkListStore* _tmp0_;
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->page_side_model;
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp0_, &_tmp1_);
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp1_;
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
+#line 3213 "ui.c"
 		{
 			gboolean _tmp3_;
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp3_ = TRUE;
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			while (TRUE) {
+#line 3220 "ui.c"
 				gboolean _tmp4_;
 				gint s = 0;
 				GtkListStore* _tmp7_;
 				GtkTreeIter _tmp8_;
 				gint _tmp9_;
 				ScanType _tmp10_;
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp4_ = _tmp3_;
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (!_tmp4_) {
+#line 3231 "ui.c"
 					GtkListStore* _tmp5_;
 					gboolean _tmp6_ = FALSE;
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp5_ = self->priv->page_side_model;
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp6_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp5_, &iter);
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					if (!_tmp6_) {
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
+#line 3242 "ui.c"
 					}
 				}
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp3_ = FALSE;
+#line 612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp7_ = self->priv->page_side_model;
+#line 612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp8_ = iter;
+#line 612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				gtk_tree_model_get ((GtkTreeModel*) _tmp7_, &_tmp8_, 0, &s, -1, -1);
+#line 613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp9_ = s;
+#line 613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp10_ = page_side;
+#line 613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp9_ == ((gint) _tmp10_)) {
+#line 3259 "ui.c"
 					GtkComboBox* _tmp11_;
 					GtkTreeIter _tmp12_;
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp11_ = self->priv->page_side_combo;
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp12_ = iter;
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_combo_box_set_active_iter (_tmp11_, &_tmp12_);
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					return;
+#line 3270 "ui.c"
 				}
 			}
 		}
@@ -1970,18 +3279,27 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint
 	gboolean have_iter = FALSE;
 	gboolean _tmp16_;
 	gboolean _tmp20_;
+#line 622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 3285 "ui.c"
 	{
 		GtkListStore* _tmp0_;
 		GtkTreeIter _tmp1_ = {0};
 		gboolean _tmp2_ = FALSE;
 		gboolean _tmp3_;
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = self->priv->paper_size_model;
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp0_, &_tmp1_);
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		iter = _tmp1_;
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		have_iter = _tmp2_;
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = TRUE;
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		while (TRUE) {
+#line 3303 "ui.c"
 			gboolean _tmp4_;
 			gboolean _tmp7_;
 			gint w = 0;
@@ -1992,60 +3310,149 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint
 			gint _tmp11_;
 			gint _tmp12_;
 			gboolean _tmp15_;
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp4_ = _tmp3_;
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (!_tmp4_) {
+#line 3318 "ui.c"
 				GtkListStore* _tmp5_;
 				gboolean _tmp6_ = FALSE;
+#line 629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp5_ = self->priv->paper_size_model;
+#line 629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp6_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp5_, &iter);
+#line 629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				have_iter = _tmp6_;
+#line 3327 "ui.c"
 			}
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp3_ = FALSE;
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp7_ = have_iter;
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (!_tmp7_) {
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
+#line 3337 "ui.c"
 			}
+#line 632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp8_ = self->priv->paper_size_model;
+#line 632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp9_ = iter;
+#line 632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_tree_model_get ((GtkTreeModel*) _tmp8_, &_tmp9_, 0, &w, 1, &h, -1, -1);
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp11_ = w;
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp12_ = width;
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (_tmp11_ == _tmp12_) {
+#line 3351 "ui.c"
 				gint _tmp13_;
 				gint _tmp14_;
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp13_ = h;
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp14_ = height;
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp10_ = _tmp13_ == _tmp14_;
+#line 3360 "ui.c"
 			} else {
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp10_ = FALSE;
+#line 3364 "ui.c"
 			}
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp15_ = _tmp10_;
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (_tmp15_) {
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
+#line 3372 "ui.c"
 			}
 		}
 	}
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = have_iter;
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp16_) {
+#line 3380 "ui.c"
 		GtkListStore* _tmp17_;
 		GtkTreeIter _tmp18_ = {0};
 		gboolean _tmp19_ = FALSE;
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp17_ = self->priv->paper_size_model;
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp19_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp17_, &_tmp18_);
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		iter = _tmp18_;
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		have_iter = _tmp19_;
+#line 3392 "ui.c"
 	}
+#line 639 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = have_iter;
+#line 639 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp20_) {
+#line 3398 "ui.c"
 		GtkComboBox* _tmp21_;
 		GtkTreeIter _tmp22_;
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp21_ = self->priv->paper_size_combo;
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp22_ = iter;
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_combo_box_set_active_iter (_tmp21_, &_tmp22_);
+#line 3407 "ui.c"
 	}
 }
 
 
+static void user_interface_set_brightness (UserInterface* self, gint brightness) {
+	GtkAdjustment* _tmp0_;
+	gint _tmp1_;
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (self != NULL);
+#line 645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = self->priv->brightness_adjustment;
+#line 645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = brightness;
+#line 645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_adjustment_set_value (_tmp0_, (gdouble) _tmp1_);
+#line 3423 "ui.c"
+}
+
+
+static void user_interface_set_contrast (UserInterface* self, gint contrast) {
+	GtkAdjustment* _tmp0_;
+	gint _tmp1_;
+#line 648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (self != NULL);
+#line 650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = self->priv->contrast_adjustment;
+#line 650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = contrast;
+#line 650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_adjustment_set_value (_tmp0_, (gdouble) _tmp1_);
+#line 3438 "ui.c"
+}
+
+
+static void user_interface_set_quality (UserInterface* self, gint quality) {
+	GtkAdjustment* _tmp0_;
+	gint _tmp1_;
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (self != NULL);
+#line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = self->priv->quality_adjustment;
+#line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = quality;
+#line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_adjustment_set_value (_tmp0_, (gdouble) _tmp1_);
+#line 3453 "ui.c"
+}
+
+
 static gint user_interface_get_text_dpi (UserInterface* self) {
 	gint result = 0;
 	GtkTreeIter iter = {0};
@@ -2053,20 +3460,34 @@ static gint user_interface_get_text_dpi (UserInterface* self) {
 	GtkComboBox* _tmp0_;
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
+#line 658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
+#line 661 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	dpi = USER_INTERFACE_DEFAULT_TEXT_DPI;
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->text_dpi_combo;
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_combo_box_get_active_iter (_tmp0_, &_tmp1_);
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp1_;
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
+#line 3476 "ui.c"
 		GtkListStore* _tmp3_;
 		GtkTreeIter _tmp4_;
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->text_dpi_model;
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = iter;
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get ((GtkTreeModel*) _tmp3_, &_tmp4_, 0, &dpi, -1, -1);
+#line 3485 "ui.c"
 	}
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = dpi;
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
+#line 3491 "ui.c"
 }
 
 
@@ -2077,20 +3498,34 @@ static gint user_interface_get_photo_dpi (UserInterface* self) {
 	GtkComboBox* _tmp0_;
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
+#line 672 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	dpi = USER_INTERFACE_DEFAULT_PHOTO_DPI;
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->photo_dpi_combo;
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_combo_box_get_active_iter (_tmp0_, &_tmp1_);
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp1_;
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
+#line 3514 "ui.c"
 		GtkListStore* _tmp3_;
 		GtkTreeIter _tmp4_;
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->photo_dpi_model;
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = iter;
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get ((GtkTreeModel*) _tmp3_, &_tmp4_, 0, &dpi, -1, -1);
+#line 3523 "ui.c"
 	}
+#line 677 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = dpi;
+#line 677 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
+#line 3529 "ui.c"
 }
 
 
@@ -2102,21 +3537,36 @@ static ScanType user_interface_get_page_side (UserInterface* self) {
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
 	gint _tmp5_;
+#line 680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
+#line 683 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page_side = (gint) SCAN_TYPE_ADF_BOTH;
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->page_side_combo;
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_combo_box_get_active_iter (_tmp0_, &_tmp1_);
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp1_;
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
+#line 3553 "ui.c"
 		GtkListStore* _tmp3_;
 		GtkTreeIter _tmp4_;
+#line 686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->page_side_model;
+#line 686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = iter;
+#line 686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get ((GtkTreeModel*) _tmp3_, &_tmp4_, 0, &page_side, -1, -1);
+#line 3562 "ui.c"
 	}
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page_side;
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = (ScanType) _tmp5_;
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
+#line 3570 "ui.c"
 }
 
 
@@ -2129,36 +3579,120 @@ static gboolean user_interface_get_paper_size (UserInterface* self, gint* width,
 	GtkComboBox* _tmp1_;
 	GtkTreeIter _tmp2_ = {0};
 	gboolean _tmp3_ = FALSE;
+#line 691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
+#line 695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_height = 0;
+#line 695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = _vala_height;
+#line 695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_width = _tmp0_;
+#line 696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->paper_size_combo;
+#line 696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = gtk_combo_box_get_active_iter (_tmp1_, &_tmp2_);
+#line 696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp2_;
+#line 696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_) {
+#line 3599 "ui.c"
 		GtkListStore* _tmp4_;
 		GtkTreeIter _tmp5_;
+#line 698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = self->priv->paper_size_model;
+#line 698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = iter;
+#line 698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get ((GtkTreeModel*) _tmp4_, &_tmp5_, 0, &_vala_width, 1, &_vala_height, -1, -1);
+#line 699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = TRUE;
+#line 699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (width) {
+#line 699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			*width = _vala_width;
+#line 3614 "ui.c"
 		}
+#line 699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (height) {
+#line 699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			*height = _vala_height;
+#line 3620 "ui.c"
 		}
+#line 699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
+#line 3624 "ui.c"
 	}
+#line 702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
+#line 702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (width) {
+#line 702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*width = _vala_width;
+#line 3632 "ui.c"
 	}
+#line 702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (height) {
+#line 702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*height = _vala_height;
+#line 3638 "ui.c"
 	}
+#line 702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return result;
+#line 3642 "ui.c"
+}
+
+
+static gint user_interface_get_brightness (UserInterface* self) {
+	gint result = 0;
+	GtkAdjustment* _tmp0_;
+	gdouble _tmp1_ = 0.0;
+#line 705 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (self != NULL, 0);
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = self->priv->brightness_adjustment;
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = gtk_adjustment_get_value (_tmp0_);
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	result = (gint) _tmp1_;
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return result;
+#line 3660 "ui.c"
+}
+
+
+static gint user_interface_get_contrast (UserInterface* self) {
+	gint result = 0;
+	GtkAdjustment* _tmp0_;
+	gdouble _tmp1_ = 0.0;
+#line 710 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (self != NULL, 0);
+#line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = self->priv->contrast_adjustment;
+#line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = gtk_adjustment_get_value (_tmp0_);
+#line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	result = (gint) _tmp1_;
+#line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
+#line 3678 "ui.c"
+}
+
+
+static gint user_interface_get_quality (UserInterface* self) {
+	gint result = 0;
+	GtkAdjustment* _tmp0_;
+	gdouble _tmp1_ = 0.0;
+#line 715 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (self != NULL, 0);
+#line 717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = self->priv->quality_adjustment;
+#line 717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = gtk_adjustment_get_value (_tmp0_);
+#line 717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	result = (gint) _tmp1_;
+#line 717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return result;
+#line 3696 "ui.c"
 }
 
 
@@ -2171,42 +3705,88 @@ static ScanOptions* user_interface_get_scan_options (UserInterface* self) {
 	ScanOptions* _tmp11_;
 	gint _tmp12_ = 0;
 	gint _tmp13_ = 0;
+	ScanOptions* _tmp14_;
+	gint _tmp15_ = 0;
+	ScanOptions* _tmp16_;
+	gint _tmp17_ = 0;
+#line 720 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
+#line 722 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = scan_options_new ();
+#line 722 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	options = _tmp0_;
+#line 723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->document_hint;
+#line 723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (g_strcmp0 (_tmp1_, "text") == 0) {
+#line 3723 "ui.c"
 		ScanOptions* _tmp2_;
 		ScanOptions* _tmp3_;
 		gint _tmp4_ = 0;
 		ScanOptions* _tmp5_;
+#line 725 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = options;
+#line 725 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_->scan_mode = SCAN_MODE_GRAY;
+#line 726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = options;
+#line 726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = user_interface_get_text_dpi (self);
+#line 726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_->dpi = _tmp4_;
+#line 727 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = options;
+#line 727 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_->depth = 2;
+#line 3742 "ui.c"
 	} else {
 		ScanOptions* _tmp6_;
 		ScanOptions* _tmp7_;
 		gint _tmp8_ = 0;
 		ScanOptions* _tmp9_;
+#line 731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = options;
+#line 731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_->scan_mode = SCAN_MODE_COLOR;
+#line 732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = options;
+#line 732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = user_interface_get_photo_dpi (self);
+#line 732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_->dpi = _tmp8_;
+#line 733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = options;
+#line 733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_->depth = 8;
+#line 3762 "ui.c"
 	}
+#line 735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = options;
+#line 735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = options;
+#line 735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_get_paper_size (self, &_tmp12_, &_tmp13_);
+#line 735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_->paper_width = _tmp12_;
+#line 735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_->paper_height = _tmp13_;
+#line 736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp14_ = options;
+#line 736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp15_ = user_interface_get_brightness (self);
+#line 736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp14_->brightness = _tmp15_;
+#line 737 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp16_ = options;
+#line 737 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp17_ = user_interface_get_contrast (self);
+#line 737 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp16_->contrast = _tmp17_;
+#line 739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = options;
+#line 739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
+#line 3790 "ui.c"
 }
 
 
@@ -2215,33 +3795,54 @@ void G_MODULE_EXPORT scan_button_clicked_cb (GtkWidget* widget, UserInterface* s
 	ScanOptions* options;
 	gchar* _tmp1_ = NULL;
 	gchar* _tmp2_;
+#line 743 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 743 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = user_interface_get_scan_options (self);
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	options = _tmp0_;
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	options->type = SCAN_TYPE_SINGLE;
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_selected_device (self);
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_emit_by_name (self, "start-scan", _tmp2_, options);
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (_tmp2_);
+#line 743 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_scan_options_unref0 (options);
+#line 3819 "ui.c"
 }
 
 
 void G_MODULE_EXPORT stop_scan_button_clicked_cb (GtkWidget* widget, UserInterface* self) {
+#line 751 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 751 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
+#line 753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_emit_by_name (self, "stop-scan");
+#line 3830 "ui.c"
 }
 
 
 void G_MODULE_EXPORT continuous_scan_button_clicked_cb (GtkWidget* widget, UserInterface* self) {
 	gboolean _tmp0_;
+#line 757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
+#line 759 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->scanning;
+#line 759 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
+#line 760 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_signal_emit_by_name (self, "stop-scan");
+#line 3846 "ui.c"
 	} else {
 		ScanOptions* _tmp1_ = NULL;
 		ScanOptions* options;
@@ -2250,45 +3851,72 @@ void G_MODULE_EXPORT continuous_scan_button_clicked_cb (GtkWidget* widget, UserI
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_;
 		ScanOptions* _tmp6_;
+#line 763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = user_interface_get_scan_options (self);
+#line 763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		options = _tmp1_;
+#line 764 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = options;
+#line 764 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = user_interface_get_page_side (self);
+#line 764 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_->type = _tmp3_;
+#line 765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = user_interface_get_selected_device (self);
+#line 765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _tmp4_;
+#line 765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = options;
+#line 765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_signal_emit_by_name (self, "start-scan", _tmp5_, _tmp6_);
+#line 765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp5_);
+#line 759 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_scan_options_unref0 (options);
+#line 3877 "ui.c"
 	}
 }
 
 
 void G_MODULE_EXPORT preferences_button_clicked_cb (GtkWidget* widget, UserInterface* self) {
 	GtkDialog* _tmp0_;
+#line 770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
+#line 772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->preferences_dialog;
+#line 772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_present ((GtkWindow*) _tmp0_);
+#line 3892 "ui.c"
 }
 
 
 gboolean G_MODULE_EXPORT preferences_dialog_delete_event_cb (GtkWidget* widget, UserInterface* self) {
 	gboolean result = FALSE;
+#line 776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
+#line 776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
+#line 778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = TRUE;
+#line 778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
+#line 3906 "ui.c"
 }
 
 
 void G_MODULE_EXPORT preferences_dialog_response_cb (GtkWidget* widget, gint response_id, UserInterface* self) {
 	GtkDialog* _tmp0_;
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
+#line 784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->preferences_dialog;
+#line 784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_hide ((GtkWidget*) _tmp0_);
+#line 3920 "ui.c"
 }
 
 
@@ -2297,18 +3925,30 @@ static void user_interface_update_page_menu (UserInterface* self) {
 	Page* _tmp1_ = NULL;
 	Page* page;
 	Page* _tmp2_;
+#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
+#line 789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_selected (_tmp0_);
+#line 789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp1_;
+#line 790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = page;
+#line 790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_ == NULL) {
+#line 3941 "ui.c"
 		GtkMenuItem* _tmp3_;
 		GtkMenuItem* _tmp4_;
+#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->page_move_left_menuitem;
+#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_sensitive ((GtkWidget*) _tmp3_, FALSE);
+#line 793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = self->priv->page_move_right_menuitem;
+#line 793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_sensitive ((GtkWidget*) _tmp4_, FALSE);
+#line 3952 "ui.c"
 	} else {
 		Book* _tmp5_;
 		Page* _tmp6_;
@@ -2320,20 +3960,35 @@ static void user_interface_update_page_menu (UserInterface* self) {
 		guint _tmp11_;
 		Book* _tmp12_;
 		guint _tmp13_ = 0U;
+#line 797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = self->priv->book;
+#line 797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = page;
+#line 797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = book_get_page_index (_tmp5_, _tmp6_);
+#line 797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		index = _tmp7_;
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = self->priv->page_move_left_menuitem;
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = index;
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_sensitive ((GtkWidget*) _tmp8_, _tmp9_ > ((guint) 0));
+#line 799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp10_ = self->priv->page_move_right_menuitem;
+#line 799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp11_ = index;
+#line 799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp12_ = self->priv->book;
+#line 799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp13_ = book_get_n_pages (_tmp12_);
+#line 799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_sensitive ((GtkWidget*) _tmp10_, _tmp11_ < (_tmp13_ - 1));
+#line 3988 "ui.c"
 	}
+#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
+#line 3992 "ui.c"
 }
 
 
@@ -2355,74 +4010,135 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view
 	GtkToggleToolButton* _tmp28_;
 	Page* _tmp29_;
 	gboolean _tmp30_ = FALSE;
+#line 803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (view != NULL);
+#line 805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
+#line 805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_ == NULL) {
+#line 806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
+#line 4024 "ui.c"
 	}
+#line 808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->updating_page_menu = TRUE;
+#line 810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_page_menu (self);
+#line 812 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	name = NULL;
+#line 813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = page;
+#line 813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = page_has_crop (_tmp1_);
+#line 813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
+#line 4038 "ui.c"
 		Page* _tmp3_;
 		gchar* _tmp4_ = NULL;
 		gchar* crop_name;
 		const gchar* _tmp5_;
+#line 816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = page;
+#line 816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = page_get_named_crop (_tmp3_);
+#line 816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		crop_name = _tmp4_;
+#line 817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = crop_name;
+#line 817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp5_ != NULL) {
+#line 4053 "ui.c"
 			const gchar* _tmp6_;
+#line 819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp6_ = crop_name;
+#line 819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (g_strcmp0 (_tmp6_, "A4") == 0) {
+#line 4059 "ui.c"
 				gchar* _tmp7_;
+#line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp7_ = g_strdup ("a4_menuitem");
+#line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (name);
+#line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				name = _tmp7_;
+#line 4067 "ui.c"
 			} else {
 				const gchar* _tmp8_;
+#line 821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp8_ = crop_name;
+#line 821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (g_strcmp0 (_tmp8_, "A5") == 0) {
+#line 4074 "ui.c"
 					gchar* _tmp9_;
+#line 822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp9_ = g_strdup ("a5_menuitem");
+#line 822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_free0 (name);
+#line 822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					name = _tmp9_;
+#line 4082 "ui.c"
 				} else {
 					const gchar* _tmp10_;
+#line 823 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp10_ = crop_name;
+#line 823 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					if (g_strcmp0 (_tmp10_, "A6") == 0) {
+#line 4089 "ui.c"
 						gchar* _tmp11_;
+#line 824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp11_ = g_strdup ("a6_menuitem");
+#line 824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_g_free0 (name);
+#line 824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						name = _tmp11_;
+#line 4097 "ui.c"
 					} else {
 						const gchar* _tmp12_;
+#line 825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp12_ = crop_name;
+#line 825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						if (g_strcmp0 (_tmp12_, "letter") == 0) {
+#line 4104 "ui.c"
 							gchar* _tmp13_;
+#line 826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp13_ = g_strdup ("letter_menuitem");
+#line 826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_g_free0 (name);
+#line 826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							name = _tmp13_;
+#line 4112 "ui.c"
 						} else {
 							const gchar* _tmp14_;
+#line 827 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp14_ = crop_name;
+#line 827 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							if (g_strcmp0 (_tmp14_, "legal") == 0) {
+#line 4119 "ui.c"
 								gchar* _tmp15_;
+#line 828 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp15_ = g_strdup ("legal_menuitem");
+#line 828 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_g_free0 (name);
+#line 828 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								name = _tmp15_;
+#line 4127 "ui.c"
 							} else {
 								const gchar* _tmp16_;
+#line 829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp16_ = crop_name;
+#line 829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								if (g_strcmp0 (_tmp16_, "4x6") == 0) {
+#line 4134 "ui.c"
 									gchar* _tmp17_;
+#line 830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 									_tmp17_ = g_strdup ("4x6_menuitem");
+#line 830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 									_g_free0 (name);
+#line 830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 									name = _tmp17_;
+#line 4142 "ui.c"
 								}
 							}
 						}
@@ -2431,36 +4147,66 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view
 			}
 		} else {
 			gchar* _tmp18_;
+#line 833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp18_ = g_strdup ("custom_crop_menuitem");
+#line 833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (name);
+#line 833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			name = _tmp18_;
+#line 4157 "ui.c"
 		}
+#line 813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (crop_name);
+#line 4161 "ui.c"
 	} else {
 		gchar* _tmp19_;
+#line 836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp19_ = g_strdup ("no_crop_menuitem");
+#line 836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (name);
+#line 836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		name = _tmp19_;
+#line 4170 "ui.c"
 	}
+#line 838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = self->priv->builder;
+#line 838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp21_ = name;
+#line 838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp22_ = gtk_builder_get_object (_tmp20_, _tmp21_);
+#line 838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp23_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItem));
+#line 838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	menuitem = _tmp23_;
+#line 839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp24_ = menuitem;
+#line 839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp24_, TRUE);
+#line 840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp25_ = self->priv->builder;
+#line 840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp26_ = gtk_builder_get_object (_tmp25_, "crop_toolbutton");
+#line 840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GTK_TYPE_TOGGLE_TOOL_BUTTON, GtkToggleToolButton));
+#line 840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	toolbutton = _tmp27_;
+#line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp28_ = toolbutton;
+#line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp29_ = page;
+#line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp30_ = page_has_crop (_tmp29_);
+#line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_toggle_tool_button_set_active (_tmp28_, _tmp30_);
+#line 843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->updating_page_menu = FALSE;
+#line 803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (toolbutton);
+#line 803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (menuitem);
+#line 803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (name);
+#line 4210 "ui.c"
 }
 
 
@@ -2472,99 +4218,167 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 	GFile* _tmp3_ = NULL;
 	GFile* file;
 	GError * _inner_error_ = NULL;
+#line 846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (view != NULL);
+#line 846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
+#line 848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = get_temporary_filename ("scanned-page", "tiff");
+#line 848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	path = _tmp0_;
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = path;
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_ == NULL) {
+#line 850 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
+#line 850 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
+#line 4240 "ui.c"
 	}
+#line 851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = path;
+#line 851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = g_file_new_for_path (_tmp2_);
+#line 851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	file = _tmp3_;
+#line 4248 "ui.c"
 	{
 		Page* _tmp4_;
-		GFile* _tmp5_;
+		gint _tmp5_ = 0;
+		GFile* _tmp6_;
+#line 855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = page;
-		_tmp5_ = file;
-		page_save (_tmp4_, "tiff", _tmp5_, &_inner_error_);
+#line 855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp5_ = user_interface_get_quality (self);
+#line 855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp6_ = file;
+#line 855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		page_save (_tmp4_, "tiff", _tmp5_, _tmp6_, &_inner_error_);
+#line 855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_inner_error_ != NULL) {
-			goto __catch16_g_error;
+#line 4263 "ui.c"
+			goto __catch17_g_error;
 		}
 	}
-	goto __finally16;
-	__catch16_g_error:
+	goto __finally17;
+	__catch17_g_error:
 	{
 		GError* e = NULL;
-		const gchar* _tmp6_ = NULL;
-		GError* _tmp7_;
-		const gchar* _tmp8_;
+		const gchar* _tmp7_ = NULL;
+		GError* _tmp8_;
+		const gchar* _tmp9_;
+#line 853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
+#line 853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-		_tmp6_ = _ ("Unable to save image for preview");
-		_tmp7_ = e;
-		_tmp8_ = _tmp7_->message;
-		user_interface_show_error_dialog (self, _tmp6_, _tmp8_);
+#line 859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp7_ = _ ("Unable to save image for preview");
+#line 859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp8_ = e;
+#line 859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp9_ = _tmp8_->message;
+#line 859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		user_interface_show_error_dialog (self, _tmp7_, _tmp9_);
+#line 862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
+#line 862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (file);
+#line 862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
+#line 862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
+#line 4294 "ui.c"
 	}
-	__finally16:
+	__finally17:
+#line 853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_inner_error_ != NULL) {
+#line 853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (file);
+#line 853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
+#line 853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
+#line 853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
+#line 4309 "ui.c"
 	}
 	{
-		GtkWindow* _tmp9_;
-		GdkScreen* _tmp10_ = NULL;
-		GFile* _tmp11_;
-		gchar* _tmp12_ = NULL;
-		gchar* _tmp13_;
-		guint32 _tmp14_ = 0U;
-		_tmp9_ = self->priv->window;
-		_tmp10_ = gtk_window_get_screen (_tmp9_);
-		_tmp11_ = file;
-		_tmp12_ = g_file_get_uri (_tmp11_);
-		_tmp13_ = _tmp12_;
-		_tmp14_ = gtk_get_current_event_time ();
-		gtk_show_uri (_tmp10_, _tmp13_, _tmp14_, &_inner_error_);
-		_g_free0 (_tmp13_);
+		GtkWindow* _tmp10_;
+		GdkScreen* _tmp11_ = NULL;
+		GFile* _tmp12_;
+		gchar* _tmp13_ = NULL;
+		gchar* _tmp14_;
+		guint32 _tmp15_ = 0U;
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp10_ = self->priv->window;
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp11_ = gtk_window_get_screen (_tmp10_);
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp12_ = file;
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp13_ = g_file_get_uri (_tmp12_);
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp14_ = _tmp13_;
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp15_ = gtk_get_current_event_time ();
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_show_uri (_tmp11_, _tmp14_, _tmp15_, &_inner_error_);
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_free0 (_tmp14_);
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_inner_error_ != NULL) {
-			goto __catch17_g_error;
+#line 4336 "ui.c"
+			goto __catch18_g_error;
 		}
 	}
-	goto __finally17;
-	__catch17_g_error:
+	goto __finally18;
+	__catch18_g_error:
 	{
 		GError* e = NULL;
-		const gchar* _tmp15_ = NULL;
-		GError* _tmp16_;
-		const gchar* _tmp17_;
+		const gchar* _tmp16_ = NULL;
+		GError* _tmp17_;
+		const gchar* _tmp18_;
+#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
+#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-		_tmp15_ = _ ("Unable to open image preview application");
-		_tmp16_ = e;
-		_tmp17_ = _tmp16_->message;
-		user_interface_show_error_dialog (self, _tmp15_, _tmp17_);
+#line 871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp16_ = _ ("Unable to open image preview application");
+#line 871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp17_ = e;
+#line 871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp18_ = _tmp17_->message;
+#line 871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		user_interface_show_error_dialog (self, _tmp16_, _tmp18_);
+#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
+#line 4361 "ui.c"
 	}
-	__finally17:
+	__finally18:
+#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_inner_error_ != NULL) {
+#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (file);
+#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
+#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
+#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
+#line 4376 "ui.c"
 	}
+#line 846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (file);
+#line 846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (path);
+#line 4382 "ui.c"
 }
 
 
@@ -2574,15 +4388,25 @@ static void user_interface_show_page_menu_cb (UserInterface* self, BookView* vie
 	GtkMenu* _tmp2_;
 	GtkMenu* menu;
 	guint32 _tmp3_ = 0U;
+#line 877 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 877 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (view != NULL);
+#line 879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->builder;
+#line 879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_builder_get_object (_tmp0_, "page_menu");
+#line 879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_MENU, GtkMenu));
+#line 879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	menu = _tmp2_;
+#line 880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = gtk_get_current_event_time ();
+#line 880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_menu_popup (menu, NULL, NULL, NULL, NULL, (guint) 3, _tmp3_);
+#line 877 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (menu);
+#line 4410 "ui.c"
 }
 
 
@@ -2592,22 +4416,39 @@ void G_MODULE_EXPORT rotate_left_button_clicked_cb (GtkWidget* widget, UserInter
 	Page* _tmp2_ = NULL;
 	Page* page;
 	Page* _tmp3_;
+#line 884 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 884 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
+#line 886 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->updating_page_menu;
+#line 886 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
+#line 887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
+#line 4430 "ui.c"
 	}
+#line 888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->book_view;
+#line 888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = book_view_get_selected (_tmp1_);
+#line 888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp2_;
+#line 889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = page;
+#line 889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_ != NULL) {
+#line 4442 "ui.c"
 		Page* _tmp4_;
+#line 890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = page;
+#line 890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		page_rotate_left (_tmp4_);
+#line 4448 "ui.c"
 	}
+#line 884 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
+#line 4452 "ui.c"
 }
 
 
@@ -2617,22 +4458,39 @@ void G_MODULE_EXPORT rotate_right_button_clicked_cb (GtkWidget* widget, UserInte
 	Page* _tmp2_ = NULL;
 	Page* page;
 	Page* _tmp3_;
+#line 894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
+#line 896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->updating_page_menu;
+#line 896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
+#line 897 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
+#line 4472 "ui.c"
 	}
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->book_view;
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = book_view_get_selected (_tmp1_);
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp2_;
+#line 899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = page;
+#line 899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_ != NULL) {
+#line 4484 "ui.c"
 		Page* _tmp4_;
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = page;
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		page_rotate_right (_tmp4_);
+#line 4490 "ui.c"
 	}
+#line 894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
+#line 4494 "ui.c"
 }
 
 
@@ -2645,33 +4503,60 @@ static void user_interface_set_crop (UserInterface* self, const gchar* crop_name
 	Page* page;
 	Page* _tmp5_;
 	const gchar* _tmp6_;
+#line 903 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->crop_rotate_menuitem;
+#line 905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = crop_name;
+#line 905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp0_, _tmp1_ != NULL);
+#line 907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = self->priv->updating_page_menu;
+#line 907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
+#line 908 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
+#line 4521 "ui.c"
 	}
+#line 910 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->book_view;
+#line 910 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = book_view_get_selected (_tmp3_);
+#line 910 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp4_;
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page;
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp5_ == NULL) {
+#line 912 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_page_unref0 (page);
+#line 912 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
+#line 4537 "ui.c"
 	}
+#line 914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = crop_name;
+#line 914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp6_ == NULL) {
+#line 4543 "ui.c"
 		Page* _tmp7_;
+#line 916 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = page;
+#line 916 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		page_set_no_crop (_tmp7_);
+#line 917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_page_unref0 (page);
+#line 917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
+#line 4553 "ui.c"
 	} else {
 		const gchar* _tmp8_;
+#line 919 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = crop_name;
+#line 919 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (g_strcmp0 (_tmp8_, "custom") == 0) {
+#line 4560 "ui.c"
 			Page* _tmp9_;
 			gint _tmp10_ = 0;
 			gint width;
@@ -2690,47 +4575,81 @@ static void user_interface_set_crop (UserInterface* self, const gchar* crop_name
 			gint _tmp20_;
 			gint _tmp21_;
 			gint _tmp22_;
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp9_ = page;
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp10_ = page_get_width (_tmp9_);
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			width = _tmp10_;
+#line 922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp11_ = page;
+#line 922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp12_ = page_get_height (_tmp11_);
+#line 922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			height = _tmp12_;
+#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp13_ = width;
+#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			crop_width = (gint) ((_tmp13_ * 0.8) + 0.5);
+#line 924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp14_ = height;
+#line 924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			crop_height = (gint) ((_tmp14_ * 0.8) + 0.5);
+#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp15_ = page;
+#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp16_ = crop_width;
+#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp17_ = crop_height;
+#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			page_set_custom_crop (_tmp15_, _tmp16_, _tmp17_);
+#line 926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp18_ = page;
+#line 926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp19_ = width;
+#line 926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp20_ = crop_width;
+#line 926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp21_ = height;
+#line 926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp22_ = crop_height;
+#line 926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			page_move_crop (_tmp18_, (_tmp19_ - _tmp20_) / 2, (_tmp21_ - _tmp22_) / 2);
+#line 4619 "ui.c"
 		} else {
 			Page* _tmp23_;
 			const gchar* _tmp24_;
+#line 929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp23_ = page;
+#line 929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp24_ = crop_name;
+#line 929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			page_set_named_crop (_tmp23_, _tmp24_);
+#line 4629 "ui.c"
 		}
 	}
+#line 903 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
+#line 4634 "ui.c"
 }
 
 
 void G_MODULE_EXPORT no_crop_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInterface* self) {
 	GtkCheckMenuItem* _tmp0_;
 	gboolean _tmp1_ = FALSE;
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
+#line 935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
+#line 935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
+#line 935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_) {
+#line 936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, NULL);
+#line 4653 "ui.c"
 	}
 }
 
@@ -2738,12 +4657,19 @@ void G_MODULE_EXPORT no_crop_menuitem_toggled_cb (GtkCheckMenuItem* widget, User
 void G_MODULE_EXPORT custom_crop_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInterface* self) {
 	GtkCheckMenuItem* _tmp0_;
 	gboolean _tmp1_ = FALSE;
+#line 940 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 940 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
+#line 942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
+#line 942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
+#line 942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_) {
+#line 943 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "custom");
+#line 4673 "ui.c"
 	}
 }
 
@@ -2754,48 +4680,81 @@ void G_MODULE_EXPORT crop_toolbutton_toggled_cb (GtkToggleToolButton* widget, Us
 	GtkToggleToolButton* _tmp1_;
 	gboolean _tmp2_ = FALSE;
 	GtkRadioMenuItem* _tmp9_;
+#line 947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
+#line 949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->updating_page_menu;
+#line 949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
+#line 950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
+#line 4694 "ui.c"
 	}
+#line 953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = widget;
+#line 953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
+#line 953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
+#line 4702 "ui.c"
 		GtkBuilder* _tmp3_;
 		GObject* _tmp4_ = NULL;
 		GtkRadioMenuItem* _tmp5_;
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->builder;
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = gtk_builder_get_object (_tmp3_, "custom_crop_menuitem");
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItem));
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (menuitem);
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		menuitem = _tmp5_;
+#line 4716 "ui.c"
 	} else {
 		GtkBuilder* _tmp6_;
 		GObject* _tmp7_ = NULL;
 		GtkRadioMenuItem* _tmp8_;
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = self->priv->builder;
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = gtk_builder_get_object (_tmp6_, "no_crop_menuitem");
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItem));
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (menuitem);
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		menuitem = _tmp8_;
+#line 4731 "ui.c"
 	}
+#line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = menuitem;
+#line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp9_, TRUE);
+#line 947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (menuitem);
+#line 4739 "ui.c"
 }
 
 
 void G_MODULE_EXPORT four_by_six_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInterface* self) {
 	GtkCheckMenuItem* _tmp0_;
 	gboolean _tmp1_ = FALSE;
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
+#line 963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
+#line 963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
+#line 963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_) {
+#line 964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "4x6");
+#line 4758 "ui.c"
 	}
 }
 
@@ -2803,12 +4762,19 @@ void G_MODULE_EXPORT four_by_six_menuitem_toggled_cb (GtkCheckMenuItem* widget,
 void G_MODULE_EXPORT legal_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInterface* self) {
 	GtkCheckMenuItem* _tmp0_;
 	gboolean _tmp1_ = FALSE;
+#line 968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
+#line 970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
+#line 970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
+#line 970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_) {
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "legal");
+#line 4778 "ui.c"
 	}
 }
 
@@ -2816,12 +4782,19 @@ void G_MODULE_EXPORT legal_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserIn
 void G_MODULE_EXPORT letter_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInterface* self) {
 	GtkCheckMenuItem* _tmp0_;
 	gboolean _tmp1_ = FALSE;
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
+#line 977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
+#line 977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
+#line 977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_) {
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "letter");
+#line 4798 "ui.c"
 	}
 }
 
@@ -2829,12 +4802,19 @@ void G_MODULE_EXPORT letter_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserI
 void G_MODULE_EXPORT a6_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInterface* self) {
 	GtkCheckMenuItem* _tmp0_;
 	gboolean _tmp1_ = FALSE;
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_) {
+#line 985 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "A6");
+#line 4818 "ui.c"
 	}
 }
 
@@ -2842,12 +4822,19 @@ void G_MODULE_EXPORT a6_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInter
 void G_MODULE_EXPORT a5_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInterface* self) {
 	GtkCheckMenuItem* _tmp0_;
 	gboolean _tmp1_ = FALSE;
+#line 989 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 989 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_) {
+#line 992 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "A5");
+#line 4838 "ui.c"
 	}
 }
 
@@ -2855,12 +4842,19 @@ void G_MODULE_EXPORT a5_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInter
 void G_MODULE_EXPORT a4_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInterface* self) {
 	GtkCheckMenuItem* _tmp0_;
 	gboolean _tmp1_ = FALSE;
+#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
+#line 998 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
+#line 998 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
+#line 998 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_) {
+#line 999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "A4");
+#line 4858 "ui.c"
 	}
 }
 
@@ -2871,19 +4865,33 @@ void G_MODULE_EXPORT crop_rotate_menuitem_activate_cb (GtkWidget* widget, UserIn
 	Page* page;
 	Page* _tmp2_;
 	Page* _tmp3_;
+#line 1003 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 1003 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
+#line 1005 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
+#line 1005 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_selected (_tmp0_);
+#line 1005 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp1_;
+#line 1006 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = page;
+#line 1006 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_ == NULL) {
+#line 1007 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_page_unref0 (page);
+#line 1007 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
+#line 4887 "ui.c"
 	}
+#line 1008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = page;
+#line 1008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page_rotate_crop (_tmp3_);
+#line 1003 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
+#line 4895 "ui.c"
 }
 
 
@@ -2896,27 +4904,47 @@ void G_MODULE_EXPORT page_move_left_menuitem_activate_cb (GtkWidget* widget, Use
 	guint _tmp4_ = 0U;
 	guint index;
 	guint _tmp5_;
+#line 1012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 1012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_selected (_tmp0_);
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp1_;
+#line 1015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = self->priv->book;
+#line 1015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = page;
+#line 1015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = book_get_page_index (_tmp2_, _tmp3_);
+#line 1015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	index = _tmp4_;
+#line 1016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = index;
+#line 1016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp5_ > ((guint) 0)) {
+#line 4930 "ui.c"
 		Book* _tmp6_;
 		Page* _tmp7_;
 		guint _tmp8_;
+#line 1017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = self->priv->book;
+#line 1017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = page;
+#line 1017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = index;
+#line 1017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		book_move_page (_tmp6_, _tmp7_, _tmp8_ - 1);
+#line 4942 "ui.c"
 	}
+#line 1019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_page_menu (self);
+#line 1012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
+#line 4948 "ui.c"
 }
 
 
@@ -2931,33 +4959,57 @@ void G_MODULE_EXPORT page_move_right_menuitem_activate_cb (GtkWidget* widget, Us
 	guint _tmp5_;
 	Book* _tmp6_;
 	guint _tmp7_ = 0U;
+#line 1023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 1023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
+#line 1025 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
+#line 1025 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_selected (_tmp0_);
+#line 1025 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp1_;
+#line 1026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = self->priv->book;
+#line 1026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = page;
+#line 1026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = book_get_page_index (_tmp2_, _tmp3_);
+#line 1026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	index = _tmp4_;
+#line 1027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = index;
+#line 1027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = self->priv->book;
+#line 1027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = book_get_n_pages (_tmp6_);
+#line 1027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp5_ < (_tmp7_ - 1)) {
+#line 4989 "ui.c"
 		Book* _tmp8_;
 		Page* _tmp9_;
 		Book* _tmp10_;
 		Page* _tmp11_;
 		guint _tmp12_ = 0U;
+#line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = self->priv->book;
+#line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = page;
+#line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp10_ = self->priv->book;
+#line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp11_ = page;
+#line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp12_ = book_get_page_index (_tmp10_, _tmp11_);
+#line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		book_move_page (_tmp8_, _tmp9_, _tmp12_ + 1);
+#line 5007 "ui.c"
 	}
+#line 1030 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_page_menu (self);
+#line 1023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
+#line 5013 "ui.c"
 }
 
 
@@ -2968,36 +5020,94 @@ void G_MODULE_EXPORT page_delete_menuitem_activate_cb (GtkWidget* widget, UserIn
 	BookView* _tmp3_;
 	Page* _tmp4_ = NULL;
 	Page* _tmp5_;
+#line 1034 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 1034 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
+#line 1036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
+#line 1036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_book (_tmp0_);
+#line 1036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
+#line 1036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->book_view;
+#line 1036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = book_view_get_selected (_tmp3_);
+#line 1036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _tmp4_;
+#line 1036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_delete_page (_tmp2_, _tmp5_);
+#line 1036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (_tmp5_);
+#line 1036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_book_unref0 (_tmp2_);
+#line 5046 "ui.c"
 }
 
 
 void G_MODULE_EXPORT save_file_button_clicked_cb (GtkWidget* widget, UserInterface* self) {
+#line 1040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 1040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
+#line 1042 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_document (self, FALSE);
+#line 5057 "ui.c"
+}
+
+
+void G_MODULE_EXPORT copy_to_clipboard_button_clicked_cb (GtkWidget* widget, UserInterface* self) {
+	BookView* _tmp0_;
+	Page* _tmp1_ = NULL;
+	Page* page;
+	Page* _tmp2_;
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (self != NULL);
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (widget != NULL);
+#line 1048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = self->priv->book_view;
+#line 1048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = book_view_get_selected (_tmp0_);
+#line 1048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	page = _tmp1_;
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = page;
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp2_ != NULL) {
+#line 5080 "ui.c"
+		Page* _tmp3_;
+		GtkWindow* _tmp4_;
+#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp3_ = page;
+#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp4_ = self->priv->window;
+#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		page_copy_to_clipboard (_tmp3_, _tmp4_);
+#line 5089 "ui.c"
+	}
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_page_unref0 (page);
+#line 5093 "ui.c"
 }
 
 
 void G_MODULE_EXPORT save_as_file_button_clicked_cb (GtkWidget* widget, UserInterface* self) {
+#line 1054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 1054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
+#line 1056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_document (self, TRUE);
+#line 5104 "ui.c"
 }
 
 
 static gpointer _cairo_reference0 (gpointer self) {
+#line 1063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self ? cairo_reference (self) : NULL;
+#line 5111 "ui.c"
 }
 
 
@@ -3032,74 +5142,136 @@ static void user_interface_draw_page (UserInterface* self, GtkPrintOperation* op
 	GdkPixbuf* image;
 	cairo_t* _tmp28_;
 	cairo_t* _tmp29_;
+#line 1059 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 1059 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (operation != NULL);
+#line 1059 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (print_context != NULL);
+#line 1063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = print_context;
+#line 1063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_print_context_get_cairo_context (_tmp0_);
+#line 1063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _cairo_reference0 (_tmp1_);
+#line 1063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	context = _tmp2_;
+#line 1064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->book;
+#line 1064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page_number;
+#line 1064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = book_get_page (_tmp3_, _tmp4_);
+#line 1064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp5_;
+#line 1067 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	is_landscape = FALSE;
+#line 1068 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = print_context;
+#line 1068 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = gtk_print_context_get_width (_tmp6_);
+#line 1068 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = print_context;
+#line 1068 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = gtk_print_context_get_height (_tmp8_);
+#line 1068 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp7_ > _tmp9_) {
+#line 1069 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		is_landscape = TRUE;
+#line 5182 "ui.c"
 	}
+#line 1070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = page;
+#line 1070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = page_is_landscape (_tmp10_);
+#line 1070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = is_landscape;
+#line 1070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp11_ != _tmp12_) {
+#line 5192 "ui.c"
 		cairo_t* _tmp13_;
 		GtkPrintContext* _tmp14_;
 		gdouble _tmp15_ = 0.0;
 		cairo_t* _tmp16_;
+#line 1072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp13_ = context;
+#line 1072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp14_ = print_context;
+#line 1072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = gtk_print_context_get_width (_tmp14_);
+#line 1072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		cairo_translate (_tmp13_, _tmp15_, (gdouble) 0);
+#line 1073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp16_ = context;
+#line 1073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		cairo_rotate (_tmp16_, G_PI_2);
+#line 5209 "ui.c"
 	}
+#line 1076 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = context;
+#line 1076 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = print_context;
+#line 1076 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = gtk_print_context_get_dpi_x (_tmp18_);
+#line 1076 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = page;
+#line 1076 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp21_ = page_get_dpi (_tmp20_);
+#line 1076 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp22_ = print_context;
+#line 1076 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp23_ = gtk_print_context_get_dpi_y (_tmp22_);
+#line 1076 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp24_ = page;
+#line 1076 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp25_ = page_get_dpi (_tmp24_);
+#line 1076 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_scale (_tmp17_, _tmp19_ / _tmp21_, _tmp23_ / _tmp25_);
+#line 1079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp26_ = page;
+#line 1079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp27_ = page_get_image (_tmp26_, TRUE);
+#line 1079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	image = _tmp27_;
+#line 1080 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp28_ = context;
+#line 1080 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gdk_cairo_set_source_pixbuf (_tmp28_, image, (gdouble) 0, (gdouble) 0);
+#line 1081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp29_ = context;
+#line 1081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_paint (_tmp29_);
+#line 1059 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (image);
+#line 1059 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
+#line 1059 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_cairo_destroy0 (context);
+#line 5251 "ui.c"
 }
 
 
 void G_MODULE_EXPORT email_button_clicked_cb (GtkWidget* widget, UserInterface* self) {
 	const gchar* _tmp0_;
+	gint _tmp1_ = 0;
+#line 1085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 1085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
+#line 1087 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->document_hint;
-	g_signal_emit_by_name (self, "email", _tmp0_);
+#line 1087 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = user_interface_get_quality (self);
+#line 1087 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_emit_by_name (self, "email", _tmp0_, _tmp1_);
+#line 5268 "ui.c"
 }
 
 
 static void _user_interface_draw_page_gtk_print_operation_draw_page (GtkPrintOperation* _sender, GtkPrintContext* context, gint page_nr, gpointer self) {
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_draw_page (self, _sender, context, page_nr);
+#line 5275 "ui.c"
 }
 
 
@@ -3110,84 +5282,136 @@ void G_MODULE_EXPORT print_button_clicked_cb (GtkWidget* widget, UserInterface*
 	guint _tmp2_ = 0U;
 	guint _tmp6_ = 0U;
 	GError * _inner_error_ = NULL;
+#line 1091 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 1091 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
+#line 1093 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = gtk_print_operation_new ();
+#line 1093 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	print = _tmp0_;
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->book;
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = book_get_n_pages (_tmp1_);
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_print_operation_set_n_pages (print, (gint) _tmp2_);
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect (print, "draw-page", (GCallback) _user_interface_draw_page_gtk_print_operation_draw_page, self);
+#line 5302 "ui.c"
 	{
 		GtkWindow* _tmp3_;
+#line 1099 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->window;
+#line 1099 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_print_operation_run (print, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, _tmp3_, &_inner_error_);
+#line 1099 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_inner_error_ != NULL) {
-			goto __catch18_g_error;
+#line 5311 "ui.c"
+			goto __catch19_g_error;
 		}
 	}
-	goto __finally18;
-	__catch18_g_error:
+	goto __finally19;
+	__catch19_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp4_;
 		const gchar* _tmp5_;
+#line 1097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
+#line 1097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
+#line 1103 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = e;
+#line 1103 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _tmp4_->message;
-		g_warning ("ui.vala:1034: Error printing: %s", _tmp5_);
+#line 1103 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_warning ("ui.vala:1103: Error printing: %s", _tmp5_);
+#line 1097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
+#line 5333 "ui.c"
 	}
-	__finally18:
+	__finally19:
+#line 1097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_inner_error_ != NULL) {
+#line 1097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (print);
+#line 1097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 1097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
+#line 1097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
+#line 5346 "ui.c"
 	}
+#line 1106 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_parse_name ("draw-page", GTK_TYPE_PRINT_OPERATION, &_tmp6_, NULL, FALSE);
+#line 1106 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_handlers_disconnect_matched (print, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _user_interface_draw_page_gtk_print_operation_draw_page, self);
+#line 1091 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (print);
+#line 5354 "ui.c"
 }
 
 
 void G_MODULE_EXPORT help_contents_menuitem_activate_cb (GtkWidget* widget, UserInterface* self) {
 	GError * _inner_error_ = NULL;
+#line 1110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 1110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
+#line 5364 "ui.c"
 	{
 		GtkWindow* _tmp0_;
 		GdkScreen* _tmp1_ = NULL;
 		guint32 _tmp2_ = 0U;
+#line 1114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = self->priv->window;
+#line 1114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = gtk_window_get_screen (_tmp0_);
+#line 1114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = gtk_get_current_event_time ();
+#line 1114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_show_uri (_tmp1_, "help:simple-scan", _tmp2_, &_inner_error_);
+#line 1114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_inner_error_ != NULL) {
-			goto __catch19_g_error;
+#line 5379 "ui.c"
+			goto __catch20_g_error;
 		}
 	}
-	goto __finally19;
-	__catch19_g_error:
+	goto __finally20;
+	__catch20_g_error:
 	{
 		GError* e = NULL;
 		const gchar* _tmp3_ = NULL;
 		GError* _tmp4_;
 		const gchar* _tmp5_;
+#line 1112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
+#line 1112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
+#line 1118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = _ ("Unable to open help file");
+#line 1118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = e;
+#line 1118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _tmp4_->message;
+#line 1118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_show_error_dialog (self, _tmp3_, _tmp5_);
+#line 1112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
+#line 5404 "ui.c"
 	}
-	__finally19:
+	__finally20:
+#line 1112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_inner_error_ != NULL) {
+#line 1112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 1112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
+#line 1112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
+#line 5415 "ui.c"
 	}
 }
 
@@ -3209,14 +5433,23 @@ void G_MODULE_EXPORT about_menuitem_activate_cb (GtkWidget* widget, UserInterfac
 	gchar* description;
 	GtkWindow* _tmp8_;
 	const gchar* _tmp9_ = NULL;
+#line 1125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 1125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
+#line 1127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = g_strdup ("Robert Ancell <robert.ancell@canonical.com>");
+#line 1127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_new0 (gchar*, 1 + 1);
+#line 1127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_[0] = _tmp0_;
+#line 1127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	authors = _tmp1_;
+#line 1127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	authors_length1 = 1;
+#line 1127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_authors_size_ = authors_length1;
+#line 1130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _ ("This program is free software: you can redistribute it and/or modify\n" \
 "it under the terms of the GNU General Public License as published by\n" \
 "the Free Software Foundation, either version 3 of the License, or\n" \
@@ -3229,21 +5462,37 @@ void G_MODULE_EXPORT about_menuitem_activate_cb (GtkWidget* widget, UserInterfac
 "\n" \
 "You should have received a copy of the GNU General Public License\n" \
 "along with this program.  If not, see <http://www.gnu.org/licenses/>.");
+#line 1130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = g_strdup (_tmp2_);
+#line 1130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	license = _tmp3_;
+#line 1133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = _ ("About Simple Scan");
+#line 1133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = g_strdup (_tmp4_);
+#line 1133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	title = _tmp5_;
+#line 1136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = _ ("Simple document scanning tool");
+#line 1136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = g_strdup (_tmp6_);
+#line 1136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	description = _tmp7_;
+#line 1138 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = self->priv->window;
+#line 1138 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = _ ("translator-credits");
+#line 1138 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_show_about_dialog (_tmp8_, "title", title, "program-name", "Simple Scan", "version", VERSION, "comments", description, "logo-icon-name", "scanner", "authors", authors, "translator-credits", _tmp9_, "website", "https://launchpad.net/simple-scan", "copyright", "Copyright © 2009-2011 Canonical Ltd.", "license", license, "wrap-license", TRUE, NULL, NULL);
+#line 1125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (description);
+#line 1125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (title);
+#line 1125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (license);
+#line 1125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	authors = (_vala_array_free (authors, authors_length1, (GDestroyNotify) g_free), NULL);
+#line 5485 "ui.c"
 }
 
 
@@ -3272,140 +5521,281 @@ static gboolean user_interface_on_quit (UserInterface* self) {
 	GSettings* _tmp19_;
 	gint _tmp20_;
 	GSettings* _tmp21_;
-	gint _tmp22_;
+	gint _tmp22_ = 0;
 	GSettings* _tmp23_;
-	gint _tmp24_;
+	gint _tmp24_ = 0;
 	GSettings* _tmp25_;
-	gboolean _tmp26_;
+	gint _tmp26_ = 0;
 	GSettings* _tmp27_;
-	ScanDirection _tmp28_;
+	gint _tmp28_;
 	GSettings* _tmp29_;
 	gint _tmp30_;
 	GSettings* _tmp31_;
-	gint _tmp32_;
+	gboolean _tmp32_;
 	GSettings* _tmp33_;
-	gint _tmp34_;
-	GtkWindow* _tmp35_;
+	ScanDirection _tmp34_;
+	GSettings* _tmp35_;
+	gint _tmp36_;
+	GSettings* _tmp37_;
+	gint _tmp38_;
+	GSettings* _tmp39_;
+	gint _tmp40_;
+	GtkWindow* _tmp41_;
+	AutosaveManager* _tmp42_;
+#line 1153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
+#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = _ ("Save document before quitting?");
+#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _ ("Quit without Saving");
+#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = user_interface_prompt_to_save (self, _tmp0_, _tmp1_);
+#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp2_) {
+#line 1159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = FALSE;
+#line 1159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
+#line 5549 "ui.c"
 	}
+#line 1161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = user_interface_get_selected_device (self);
+#line 1161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	device = _tmp3_;
+#line 1162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	paper_width = 0;
+#line 1162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	paper_height = 0;
+#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_get_paper_size (self, &_tmp4_, &_tmp5_);
+#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	paper_width = _tmp4_;
+#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	paper_height = _tmp5_;
+#line 1165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = device;
+#line 1165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp6_ != NULL) {
+#line 5569 "ui.c"
 		GSettings* _tmp7_;
 		const gchar* _tmp8_;
+#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = self->priv->settings;
+#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = device;
+#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_settings_set_string (_tmp7_, "selected-device", _tmp8_);
+#line 5578 "ui.c"
 	}
+#line 1167 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = self->priv->settings;
+#line 1167 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = self->priv->document_hint;
+#line 1167 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_string (_tmp9_, "document-type", _tmp10_);
+#line 1168 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = self->priv->settings;
+#line 1168 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = user_interface_get_text_dpi (self);
+#line 1168 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp11_, "text-dpi", _tmp12_);
+#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = self->priv->settings;
+#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = user_interface_get_photo_dpi (self);
+#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp13_, "photo-dpi", _tmp14_);
+#line 1170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = self->priv->settings;
+#line 1170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = user_interface_get_page_side (self);
+#line 1170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_enum (_tmp15_, "page-side", (gint) _tmp16_);
+#line 1171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = self->priv->settings;
+#line 1171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = paper_width;
+#line 1171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp17_, "paper-width", _tmp18_);
+#line 1172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = self->priv->settings;
+#line 1172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = paper_height;
+#line 1172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp19_, "paper-height", _tmp20_);
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp21_ = self->priv->settings;
-	_tmp22_ = self->priv->window_width;
-	g_settings_set_int (_tmp21_, "window-width", _tmp22_);
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp22_ = user_interface_get_brightness (self);
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_settings_set_int (_tmp21_, "brightness", _tmp22_);
+#line 1174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp23_ = self->priv->settings;
-	_tmp24_ = self->priv->window_height;
-	g_settings_set_int (_tmp23_, "window-height", _tmp24_);
+#line 1174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp24_ = user_interface_get_contrast (self);
+#line 1174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_settings_set_int (_tmp23_, "contrast", _tmp24_);
+#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp25_ = self->priv->settings;
-	_tmp26_ = self->priv->window_is_maximized;
-	g_settings_set_boolean (_tmp25_, "window-is-maximized", _tmp26_);
+#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp26_ = user_interface_get_quality (self);
+#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_settings_set_int (_tmp25_, "jpeg-quality", _tmp26_);
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp27_ = self->priv->settings;
-	_tmp28_ = self->priv->default_page_scan_direction;
-	g_settings_set_enum (_tmp27_, "scan-direction", (gint) _tmp28_);
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp28_ = self->priv->window_width;
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_settings_set_int (_tmp27_, "window-width", _tmp28_);
+#line 1177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp29_ = self->priv->settings;
-	_tmp30_ = self->priv->default_page_width;
-	g_settings_set_int (_tmp29_, "page-width", _tmp30_);
+#line 1177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp30_ = self->priv->window_height;
+#line 1177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_settings_set_int (_tmp29_, "window-height", _tmp30_);
+#line 1178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp31_ = self->priv->settings;
-	_tmp32_ = self->priv->default_page_height;
-	g_settings_set_int (_tmp31_, "page-height", _tmp32_);
+#line 1178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp32_ = self->priv->window_is_maximized;
+#line 1178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_settings_set_boolean (_tmp31_, "window-is-maximized", _tmp32_);
+#line 1179 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp33_ = self->priv->settings;
-	_tmp34_ = self->priv->default_page_dpi;
-	g_settings_set_int (_tmp33_, "page-dpi", _tmp34_);
-	_tmp35_ = self->priv->window;
-	gtk_widget_destroy ((GtkWidget*) _tmp35_);
+#line 1179 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp34_ = self->priv->default_page_scan_direction;
+#line 1179 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_settings_set_enum (_tmp33_, "scan-direction", (gint) _tmp34_);
+#line 1180 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp35_ = self->priv->settings;
+#line 1180 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp36_ = self->priv->default_page_width;
+#line 1180 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_settings_set_int (_tmp35_, "page-width", _tmp36_);
+#line 1181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp37_ = self->priv->settings;
+#line 1181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp38_ = self->priv->default_page_height;
+#line 1181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_settings_set_int (_tmp37_, "page-height", _tmp38_);
+#line 1182 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp39_ = self->priv->settings;
+#line 1182 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp40_ = self->priv->default_page_dpi;
+#line 1182 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_settings_set_int (_tmp39_, "page-dpi", _tmp40_);
+#line 1184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp41_ = self->priv->window;
+#line 1184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_destroy ((GtkWidget*) _tmp41_);
+#line 1186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp42_ = self->priv->autosave_manager;
+#line 1186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp42_ != NULL) {
+#line 5684 "ui.c"
+		AutosaveManager* _tmp43_;
+#line 1187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp43_ = self->priv->autosave_manager;
+#line 1187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		autosave_manager_cleanup (_tmp43_);
+#line 5690 "ui.c"
+	}
+#line 1189 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = TRUE;
+#line 1189 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (device);
+#line 1189 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
+#line 5698 "ui.c"
 }
 
 
 void G_MODULE_EXPORT quit_menuitem_activate_cb (GtkWidget* widget, UserInterface* self) {
+#line 1193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 1193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
+#line 1195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_on_quit (self);
+#line 5709 "ui.c"
 }
 
 
 gboolean G_MODULE_EXPORT simple_scan_window_configure_event_cb (GtkWidget* widget, GdkEventConfigure* event, UserInterface* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_;
+#line 1199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
+#line 1199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
+#line 1199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
+#line 1201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->window_is_maximized;
+#line 1201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp0_) {
+#line 5726 "ui.c"
 		GdkEventConfigure _tmp1_;
 		gint _tmp2_;
 		GdkEventConfigure _tmp3_;
 		gint _tmp4_;
+#line 1203 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = *event;
+#line 1203 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = _tmp1_.width;
+#line 1203 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->window_width = _tmp2_;
+#line 1204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = *event;
+#line 1204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = _tmp3_.height;
+#line 1204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->window_height = _tmp4_;
+#line 5743 "ui.c"
 	}
+#line 1207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
+#line 1207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
+#line 5749 "ui.c"
 }
 
 
 static void user_interface_info_bar_response_cb (UserInterface* self, GtkInfoBar* widget, gint response_id) {
 	gint _tmp0_;
+#line 1210 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 1210 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
+#line 1212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = response_id;
+#line 1212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_ == 1) {
+#line 5763 "ui.c"
 		GtkComboBox* _tmp1_;
 		GtkDialog* _tmp2_;
+#line 1214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = self->priv->device_combo;
+#line 1214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_grab_focus ((GtkWidget*) _tmp1_);
+#line 1215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = self->priv->preferences_dialog;
+#line 1215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_window_present ((GtkWindow*) _tmp2_);
+#line 5774 "ui.c"
 	} else {
+#line 1219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->have_error = FALSE;
+#line 1220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (self->priv->error_title);
+#line 1220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->error_title = NULL;
+#line 1221 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (self->priv->error_text);
+#line 1221 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->error_text = NULL;
+#line 1222 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_update_info_bar (self);
+#line 5788 "ui.c"
 	}
 }
 
@@ -3414,32 +5804,53 @@ gboolean G_MODULE_EXPORT simple_scan_window_window_state_event_cb (GtkWidget* wi
 	gboolean result = FALSE;
 	GdkEventWindowState _tmp0_;
 	GdkWindowState _tmp1_;
+#line 1227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
+#line 1227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
+#line 1227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
+#line 1229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = *event;
+#line 1229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _tmp0_.changed_mask;
+#line 1229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if ((_tmp1_ & GDK_WINDOW_STATE_MAXIMIZED) != 0) {
+#line 5809 "ui.c"
 		GdkEventWindowState _tmp2_;
 		GdkWindowState _tmp3_;
+#line 1230 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = *event;
+#line 1230 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = _tmp2_.new_window_state;
+#line 1230 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->window_is_maximized = (_tmp3_ & GDK_WINDOW_STATE_MAXIMIZED) != 0;
+#line 5818 "ui.c"
 	}
+#line 1231 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
+#line 1231 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
+#line 5824 "ui.c"
 }
 
 
 gboolean G_MODULE_EXPORT window_delete_event_cb (GtkWidget* widget, GdkEvent* event, UserInterface* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
+#line 1235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
+#line 1235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
+#line 1235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
+#line 1237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = user_interface_on_quit (self);
+#line 1237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = !_tmp0_;
+#line 1237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
+#line 5843 "ui.c"
 }
 
 
@@ -3450,38 +5861,60 @@ static void user_interface_page_size_changed_cb (UserInterface* self, Page* page
 	gint _tmp3_ = 0;
 	Page* _tmp4_;
 	gint _tmp5_ = 0;
+#line 1240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 1240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
+#line 1242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
+#line 1242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = page_get_width (_tmp0_);
+#line 1242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_width = _tmp1_;
+#line 1243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = page;
+#line 1243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = page_get_height (_tmp2_);
+#line 1243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_height = _tmp3_;
+#line 1244 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page;
+#line 1244 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page_get_dpi (_tmp4_);
+#line 1244 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_dpi = _tmp5_;
+#line 5876 "ui.c"
 }
 
 
 static void user_interface_page_scan_direction_changed_cb (UserInterface* self, Page* page) {
 	Page* _tmp0_;
 	ScanDirection _tmp1_ = 0;
+#line 1247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 1247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
+#line 1249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
+#line 1249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = page_get_scan_direction (_tmp0_);
+#line 1249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_scan_direction = _tmp1_;
+#line 5893 "ui.c"
 }
 
 
 static void _user_interface_page_size_changed_cb_page_size_changed (Page* _sender, gpointer self) {
+#line 1258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_size_changed_cb (self, _sender);
+#line 5900 "ui.c"
 }
 
 
 static void _user_interface_page_scan_direction_changed_cb_page_scan_direction_changed (Page* _sender, gpointer self) {
+#line 1259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_scan_direction_changed_cb (self, _sender);
+#line 5907 "ui.c"
 }
 
 
@@ -3496,26 +5929,47 @@ static void user_interface_page_added_cb (UserInterface* self, Book* book, Page*
 	ScanDirection _tmp7_ = 0;
 	Page* _tmp8_;
 	Page* _tmp9_;
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (book != NULL);
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
+#line 1254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
+#line 1254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = page_get_width (_tmp0_);
+#line 1254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_width = _tmp1_;
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = page;
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = page_get_height (_tmp2_);
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_height = _tmp3_;
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page;
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page_get_dpi (_tmp4_);
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_dpi = _tmp5_;
+#line 1257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = page;
+#line 1257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = page_get_scan_direction (_tmp6_);
+#line 1257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_scan_direction = _tmp7_;
+#line 1258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = page;
+#line 1258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect (_tmp8_, "size-changed", (GCallback) _user_interface_page_size_changed_cb_page_size_changed, self);
+#line 1259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = page;
+#line 1259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect (_tmp9_, "scan-direction-changed", (GCallback) _user_interface_page_scan_direction_changed_cb_page_scan_direction_changed, self);
+#line 1261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_page_menu (self);
+#line 5962 "ui.c"
 }
 
 
@@ -3526,21 +5980,37 @@ static void user_interface_page_removed_cb (UserInterface* self, Book* book, Pag
 	guint _tmp3_ = 0U;
 	Book* _tmp4_;
 	guint _tmp5_ = 0U;
+#line 1264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 1264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (book != NULL);
+#line 1264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
+#line 1266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
+#line 1266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_parse_name ("size-changed", TYPE_PAGE, &_tmp1_, NULL, FALSE);
+#line 1266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _user_interface_page_size_changed_cb_page_size_changed, self);
+#line 1267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = page;
+#line 1267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_parse_name ("scan-direction-changed", TYPE_PAGE, &_tmp3_, NULL, FALSE);
+#line 1267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _user_interface_page_scan_direction_changed_cb_page_scan_direction_changed, self);
+#line 1270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = book;
+#line 1270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = book_get_n_pages (_tmp4_);
+#line 1270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp5_ == ((guint) 1)) {
+#line 1271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_add_default_page (self);
+#line 5999 "ui.c"
 	}
+#line 1273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_page_menu (self);
+#line 6003 "ui.c"
 }
 
 
@@ -3561,43 +6031,77 @@ static void user_interface_set_dpi_combo (UserInterface* self, GtkComboBox* comb
 	gint _scan_resolutions_size_;
 	gint* _tmp9_;
 	gint _tmp9__length1;
+#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (combo != NULL);
+#line 1278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
+#line 1278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp0_);
+#line 1278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	renderer = _tmp0_;
+#line 1279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = combo;
+#line 1279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = renderer;
+#line 1279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp1_, (GtkCellRenderer*) _tmp2_, TRUE);
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = combo;
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = renderer;
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp3_, (GtkCellRenderer*) _tmp4_, "text", 1);
+#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = combo;
+#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = gtk_combo_box_get_model (_tmp5_);
+#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_LIST_STORE, GtkListStore));
+#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	model = _tmp7_;
+#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = g_new0 (gint, 6);
+#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_[0] = 75;
+#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_[1] = 150;
+#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_[2] = 300;
+#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_[3] = 600;
+#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_[4] = 1200;
+#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_[5] = 2400;
+#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	scan_resolutions = _tmp8_;
+#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	scan_resolutions_length1 = 6;
+#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_scan_resolutions_size_ = scan_resolutions_length1;
+#line 1284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = scan_resolutions;
+#line 1284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9__length1 = scan_resolutions_length1;
+#line 6078 "ui.c"
 	{
 		gint* dpi_collection = NULL;
 		gint dpi_collection_length1 = 0;
 		gint _dpi_collection_size_ = 0;
 		gint dpi_it = 0;
+#line 1284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		dpi_collection = _tmp9_;
+#line 1284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		dpi_collection_length1 = _tmp9__length1;
+#line 1284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		for (dpi_it = 0; dpi_it < _tmp9__length1; dpi_it = dpi_it + 1) {
+#line 6090 "ui.c"
 			gint dpi = 0;
+#line 1284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			dpi = dpi_collection[dpi_it];
+#line 6094 "ui.c"
 			{
 				gchar* label = NULL;
 				gint _tmp10_;
@@ -3611,77 +6115,133 @@ static void user_interface_set_dpi_combo (UserInterface* self, GtkComboBox* comb
 				const gchar* _tmp31_;
 				gint _tmp32_;
 				gint _tmp33_;
+#line 1287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp10_ = dpi;
+#line 1287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp11_ = default_dpi;
+#line 1287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp10_ == _tmp11_) {
+#line 6114 "ui.c"
 					const gchar* _tmp12_ = NULL;
 					gint _tmp13_;
 					gchar* _tmp14_ = NULL;
+#line 1289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp12_ = _ ("%d dpi (default)");
+#line 1289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp13_ = dpi;
+#line 1289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp14_ = g_strdup_printf (_tmp12_, _tmp13_);
+#line 1289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_free0 (label);
+#line 1289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					label = _tmp14_;
+#line 6128 "ui.c"
 				} else {
 					gint _tmp15_;
+#line 1290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp15_ = dpi;
+#line 1290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					if (_tmp15_ == 75) {
+#line 6135 "ui.c"
 						const gchar* _tmp16_ = NULL;
 						gint _tmp17_;
 						gchar* _tmp18_ = NULL;
+#line 1292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp16_ = _ ("%d dpi (draft)");
+#line 1292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp17_ = dpi;
+#line 1292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp18_ = g_strdup_printf (_tmp16_, _tmp17_);
+#line 1292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_g_free0 (label);
+#line 1292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						label = _tmp18_;
+#line 6149 "ui.c"
 					} else {
 						gint _tmp19_;
+#line 1293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp19_ = dpi;
+#line 1293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						if (_tmp19_ == 1200) {
+#line 6156 "ui.c"
 							const gchar* _tmp20_ = NULL;
 							gint _tmp21_;
 							gchar* _tmp22_ = NULL;
+#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp20_ = _ ("%d dpi (high resolution)");
+#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp21_ = dpi;
+#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp22_ = g_strdup_printf (_tmp20_, _tmp21_);
+#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_g_free0 (label);
+#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							label = _tmp22_;
+#line 6170 "ui.c"
 						} else {
 							const gchar* _tmp23_ = NULL;
 							gint _tmp24_;
 							gchar* _tmp25_ = NULL;
+#line 1298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp23_ = _ ("%d dpi");
+#line 1298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp24_ = dpi;
+#line 1298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp25_ = g_strdup_printf (_tmp23_, _tmp24_);
+#line 1298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_g_free0 (label);
+#line 1298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							label = _tmp25_;
+#line 6185 "ui.c"
 						}
 					}
 				}
+#line 1301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp26_ = model;
+#line 1301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				gtk_list_store_append (_tmp26_, &_tmp27_);
+#line 1301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				iter = _tmp27_;
+#line 1302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp28_ = model;
+#line 1302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp29_ = iter;
+#line 1302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp30_ = dpi;
+#line 1302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp31_ = label;
+#line 1302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				gtk_list_store_set (_tmp28_, &_tmp29_, 0, _tmp30_, 1, _tmp31_, -1, -1);
+#line 1304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp32_ = dpi;
+#line 1304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp33_ = current_dpi;
+#line 1304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp32_ == _tmp33_) {
+#line 6211 "ui.c"
 					GtkComboBox* _tmp34_;
 					GtkTreeIter _tmp35_;
+#line 1305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp34_ = combo;
+#line 1305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp35_ = iter;
+#line 1305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_combo_box_set_active_iter (_tmp34_, &_tmp35_);
+#line 6220 "ui.c"
 				}
+#line 1284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (label);
+#line 6224 "ui.c"
 			}
 		}
 	}
+#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	scan_resolutions = (g_free (scan_resolutions), NULL);
+#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (model);
+#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (renderer);
+#line 6234 "ui.c"
 }
 
 
@@ -3694,803 +6254,1614 @@ static void user_interface_needs_saving_cb (UserInterface* self, Book* book) {
 	gboolean _tmp5_ = FALSE;
 	Book* _tmp6_;
 	gboolean _tmp7_ = FALSE;
+	GtkMenuItem* _tmp9_;
+#line 1309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 1309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (book != NULL);
+#line 1311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->save_menuitem;
+#line 1311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book;
+#line 1311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = book_get_needs_saving (_tmp1_);
+#line 1311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp0_, _tmp2_);
+#line 1312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->save_toolbutton;
+#line 1312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = book;
+#line 1312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = book_get_needs_saving (_tmp4_);
+#line 1312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp3_, _tmp5_);
+#line 1313 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = book;
+#line 1313 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = book_get_needs_saving (_tmp6_);
+#line 1313 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp7_) {
+#line 6274 "ui.c"
 		GtkMenuItem* _tmp8_;
+#line 1314 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = self->priv->save_as_menuitem;
+#line 1314 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_sensitive ((GtkWidget*) _tmp8_, TRUE);
+#line 6280 "ui.c"
 	}
+#line 1315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp9_ = self->priv->copy_to_clipboard_menuitem;
+#line 1315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_sensitive ((GtkWidget*) _tmp9_, TRUE);
+#line 6286 "ui.c"
 }
 
 
 static void _user_interface_info_bar_response_cb_gtk_info_bar_response (GtkInfoBar* _sender, gint response_id, gpointer self) {
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_info_bar_response_cb (self, _sender, response_id);
+#line 6293 "ui.c"
 }
 
 
 static void _user_interface_page_selected_cb_book_view_page_selected (BookView* _sender, Page* page, gpointer self) {
+#line 1489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_selected_cb (self, _sender, page);
+#line 6300 "ui.c"
 }
 
 
 static void _user_interface_show_page_cb_book_view_show_page (BookView* _sender, Page* page, gpointer self) {
+#line 1490 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_show_page_cb (self, _sender, page);
+#line 6307 "ui.c"
 }
 
 
 static void _user_interface_show_page_menu_cb_book_view_show_menu (BookView* _sender, gpointer self) {
+#line 1491 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_show_page_menu_cb (self, _sender);
+#line 6314 "ui.c"
 }
 
 
 static void _user_interface_needs_saving_cb_book_needs_saving_changed (Book* _sender, gpointer self) {
+#line 1525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_needs_saving_cb (self, _sender);
+#line 6321 "ui.c"
 }
 
 
 static void _user_interface_book_saving_cb_book_saving (Book* _sender, gint i, gpointer self) {
+#line 1528 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_book_saving_cb (self, i);
+#line 6328 "ui.c"
 }
 
 
 static void user_interface_load (UserInterface* self) {
 	GtkIconTheme* _tmp0_ = NULL;
 	GtkBuilder* _tmp1_;
-	gchar* _tmp2_ = NULL;
-	gchar* filename;
+	GtkBuilder* _tmp7_;
 	GtkBuilder* _tmp8_;
-	GtkBuilder* _tmp9_;
-	GObject* _tmp10_ = NULL;
-	GtkWindow* _tmp11_;
-	GApplication* _tmp12_ = NULL;
-	GtkApplication* _tmp13_;
+	GObject* _tmp9_ = NULL;
+	GtkWindow* _tmp10_;
+	GApplication* _tmp11_ = NULL;
+	GtkApplication* _tmp12_;
 	GtkApplication* app;
-	GtkApplication* _tmp14_;
-	GtkWindow* _tmp15_;
-	GtkBuilder* _tmp16_;
-	GObject* _tmp17_ = NULL;
-	GtkVBox* _tmp18_;
-	GtkBuilder* _tmp19_;
-	GObject* _tmp20_ = NULL;
-	GtkMenuItem* _tmp21_;
-	GtkBuilder* _tmp22_;
-	GObject* _tmp23_ = NULL;
-	GtkMenuItem* _tmp24_;
-	GtkBuilder* _tmp25_;
-	GObject* _tmp26_ = NULL;
-	GtkMenuItem* _tmp27_;
-	GtkBuilder* _tmp28_;
-	GObject* _tmp29_ = NULL;
-	GtkMenuItem* _tmp30_;
-	GtkBuilder* _tmp31_;
-	GObject* _tmp32_ = NULL;
-	GtkMenuItem* _tmp33_;
-	GtkBuilder* _tmp34_;
-	GObject* _tmp35_ = NULL;
-	GtkMenuItem* _tmp36_;
-	GtkBuilder* _tmp37_;
-	GObject* _tmp38_ = NULL;
-	GtkToolButton* _tmp39_;
-	GtkBuilder* _tmp40_;
-	GObject* _tmp41_ = NULL;
-	GtkMenuItem* _tmp42_;
-	GtkBuilder* _tmp43_;
-	GObject* _tmp44_ = NULL;
-	GtkToolButton* _tmp45_;
-	GtkBuilder* _tmp46_;
-	GObject* _tmp47_ = NULL;
-	GtkRadioMenuItem* _tmp48_;
-	GtkBuilder* _tmp49_;
-	GObject* _tmp50_ = NULL;
-	GtkRadioMenuItem* _tmp51_;
-	GtkBuilder* _tmp52_;
-	GObject* _tmp53_ = NULL;
-	GtkRadioMenuItem* _tmp54_;
-	GtkBuilder* _tmp55_;
-	GObject* _tmp56_ = NULL;
-	GtkRadioMenuItem* _tmp57_;
-	GtkBuilder* _tmp58_;
-	GObject* _tmp59_ = NULL;
-	GtkDialog* _tmp60_;
-	GtkBuilder* _tmp61_;
-	GObject* _tmp62_ = NULL;
-	GtkLabel* _tmp63_;
-	GtkBuilder* _tmp64_;
-	GObject* _tmp65_ = NULL;
-	GtkEntry* _tmp66_;
-	GtkBuilder* _tmp67_;
-	GObject* _tmp68_ = NULL;
-	GtkEntry* _tmp69_;
-	GtkBuilder* _tmp70_;
-	GObject* _tmp71_ = NULL;
-	GtkDialog* _tmp72_;
-	GtkBuilder* _tmp73_;
-	GObject* _tmp74_ = NULL;
-	GtkComboBox* _tmp75_;
-	GtkComboBox* _tmp76_;
-	GtkTreeModel* _tmp77_ = NULL;
-	GtkListStore* _tmp78_;
-	GtkBuilder* _tmp79_;
-	GObject* _tmp80_ = NULL;
-	GtkComboBox* _tmp81_;
-	GtkComboBox* _tmp82_;
-	GtkTreeModel* _tmp83_ = NULL;
-	GtkListStore* _tmp84_;
-	GtkBuilder* _tmp85_;
-	GObject* _tmp86_ = NULL;
-	GtkComboBox* _tmp87_;
-	GtkComboBox* _tmp88_;
-	GtkTreeModel* _tmp89_ = NULL;
-	GtkListStore* _tmp90_;
-	GtkBuilder* _tmp91_;
-	GObject* _tmp92_ = NULL;
-	GtkComboBox* _tmp93_;
-	GtkComboBox* _tmp94_;
-	GtkTreeModel* _tmp95_ = NULL;
-	GtkListStore* _tmp96_;
-	GtkBuilder* _tmp97_;
-	GObject* _tmp98_ = NULL;
-	GtkComboBox* _tmp99_;
-	GtkComboBox* _tmp100_;
-	GtkTreeModel* _tmp101_ = NULL;
-	GtkListStore* _tmp102_;
-	GtkInfoBar* _tmp103_;
-	GtkInfoBar* _tmp104_;
-	GtkVBox* _tmp105_;
-	GtkInfoBar* _tmp106_;
-	GtkBox* _tmp107_;
-	GtkBox* hbox;
-	GtkInfoBar* _tmp108_;
-	GtkContainer* _tmp109_ = NULL;
-	GtkContainer* _tmp110_;
-	GtkContainer* content_area;
-	GtkContainer* _tmp111_;
-	GtkBox* _tmp112_;
-	GtkBox* _tmp113_;
-	GtkImage* _tmp114_;
-	GtkBox* _tmp115_;
-	GtkImage* _tmp116_;
-	GtkImage* _tmp117_;
-	GtkLabel* _tmp118_;
-	GtkLabel* _tmp119_;
-	GtkBox* _tmp120_;
-	GtkLabel* _tmp121_;
-	GtkLabel* _tmp122_;
+	GtkApplication* _tmp13_;
+	GtkWindow* _tmp14_;
+	GtkBuilder* _tmp15_;
+	GObject* _tmp16_ = NULL;
+	GtkVBox* _tmp17_;
+	GtkBuilder* _tmp18_;
+	GObject* _tmp19_ = NULL;
+	GtkMenuItem* _tmp20_;
+	GtkBuilder* _tmp21_;
+	GObject* _tmp22_ = NULL;
+	GtkMenuItem* _tmp23_;
+	GtkBuilder* _tmp24_;
+	GObject* _tmp25_ = NULL;
+	GtkMenuItem* _tmp26_;
+	GtkBuilder* _tmp27_;
+	GObject* _tmp28_ = NULL;
+	GtkMenuItem* _tmp29_;
+	GtkBuilder* _tmp30_;
+	GObject* _tmp31_ = NULL;
+	GtkMenuItem* _tmp32_;
+	GtkBuilder* _tmp33_;
+	GObject* _tmp34_ = NULL;
+	GtkMenuItem* _tmp35_;
+	GtkBuilder* _tmp36_;
+	GObject* _tmp37_ = NULL;
+	GtkMenuItem* _tmp38_;
+	GtkBuilder* _tmp39_;
+	GObject* _tmp40_ = NULL;
+	GtkToolButton* _tmp41_;
+	GtkBuilder* _tmp42_;
+	GObject* _tmp43_ = NULL;
+	GtkMenuItem* _tmp44_;
+	GtkBuilder* _tmp45_;
+	GObject* _tmp46_ = NULL;
+	GtkToolButton* _tmp47_;
+	GtkBuilder* _tmp48_;
+	GObject* _tmp49_ = NULL;
+	GtkRadioMenuItem* _tmp50_;
+	GtkBuilder* _tmp51_;
+	GObject* _tmp52_ = NULL;
+	GtkRadioMenuItem* _tmp53_;
+	GtkBuilder* _tmp54_;
+	GObject* _tmp55_ = NULL;
+	GtkRadioMenuItem* _tmp56_;
+	GtkBuilder* _tmp57_;
+	GObject* _tmp58_ = NULL;
+	GtkRadioMenuItem* _tmp59_;
+	GtkBuilder* _tmp60_;
+	GObject* _tmp61_ = NULL;
+	GtkDialog* _tmp62_;
+	GtkBuilder* _tmp63_;
+	GObject* _tmp64_ = NULL;
+	GtkLabel* _tmp65_;
+	GtkBuilder* _tmp66_;
+	GObject* _tmp67_ = NULL;
+	GtkEntry* _tmp68_;
+	GtkBuilder* _tmp69_;
+	GObject* _tmp70_ = NULL;
+	GtkEntry* _tmp71_;
+	GtkBuilder* _tmp72_;
+	GObject* _tmp73_ = NULL;
+	GtkDialog* _tmp74_;
+	GtkBuilder* _tmp75_;
+	GObject* _tmp76_ = NULL;
+	GtkComboBox* _tmp77_;
+	GtkComboBox* _tmp78_;
+	GtkTreeModel* _tmp79_ = NULL;
+	GtkListStore* _tmp80_;
+	GtkBuilder* _tmp81_;
+	GObject* _tmp82_ = NULL;
+	GtkComboBox* _tmp83_;
+	GtkComboBox* _tmp84_;
+	GtkTreeModel* _tmp85_ = NULL;
+	GtkListStore* _tmp86_;
+	GtkBuilder* _tmp87_;
+	GObject* _tmp88_ = NULL;
+	GtkComboBox* _tmp89_;
+	GtkComboBox* _tmp90_;
+	GtkTreeModel* _tmp91_ = NULL;
+	GtkListStore* _tmp92_;
+	GtkBuilder* _tmp93_;
+	GObject* _tmp94_ = NULL;
+	GtkComboBox* _tmp95_;
+	GtkComboBox* _tmp96_;
+	GtkTreeModel* _tmp97_ = NULL;
+	GtkListStore* _tmp98_;
+	GtkBuilder* _tmp99_;
+	GObject* _tmp100_ = NULL;
+	GtkComboBox* _tmp101_;
+	GtkComboBox* _tmp102_;
+	GtkTreeModel* _tmp103_ = NULL;
+	GtkListStore* _tmp104_;
+	GtkBuilder* _tmp105_;
+	GObject* _tmp106_ = NULL;
+	GtkScale* _tmp107_;
+	GtkScale* _tmp108_;
+	GtkAdjustment* _tmp109_ = NULL;
+	GtkAdjustment* _tmp110_;
+	GtkBuilder* _tmp111_;
+	GObject* _tmp112_ = NULL;
+	GtkScale* _tmp113_;
+	GtkScale* _tmp114_;
+	GtkAdjustment* _tmp115_ = NULL;
+	GtkAdjustment* _tmp116_;
+	GtkBuilder* _tmp117_;
+	GObject* _tmp118_ = NULL;
+	GtkScale* _tmp119_;
+	GtkScale* _tmp120_;
+	GtkAdjustment* _tmp121_ = NULL;
+	GtkAdjustment* _tmp122_;
 	GtkInfoBar* _tmp123_;
-	GtkButton* _tmp124_ = NULL;
-	GtkButton* _tmp125_;
+	GtkInfoBar* _tmp124_;
+	GtkVBox* _tmp125_;
 	GtkInfoBar* _tmp126_;
-	const gchar* _tmp127_ = NULL;
-	GtkButton* _tmp128_ = NULL;
-	GtkButton* _tmp129_;
+	GtkBox* _tmp127_;
+	GtkBox* hbox;
+	GtkInfoBar* _tmp128_;
+	GtkContainer* _tmp129_ = NULL;
+	GtkContainer* _tmp130_;
+	GtkContainer* content_area;
+	GtkContainer* _tmp131_;
+	GtkBox* _tmp132_;
+	GtkBox* _tmp133_;
+	GtkImage* _tmp134_;
+	GtkBox* _tmp135_;
+	GtkImage* _tmp136_;
+	GtkImage* _tmp137_;
+	GtkLabel* _tmp138_;
+	GtkLabel* _tmp139_;
+	GtkBox* _tmp140_;
+	GtkLabel* _tmp141_;
+	GtkLabel* _tmp142_;
+	GtkInfoBar* _tmp143_;
+	GtkButton* _tmp144_ = NULL;
+	GtkButton* _tmp145_;
+	GtkInfoBar* _tmp146_;
+	const gchar* _tmp147_ = NULL;
+	GtkButton* _tmp148_ = NULL;
+	GtkButton* _tmp149_;
 	GtkTreeIter iter = {0};
-	GtkListStore* _tmp130_;
-	GtkTreeIter _tmp131_ = {0};
-	GtkListStore* _tmp132_;
-	GtkTreeIter _tmp133_;
-	const gchar* _tmp134_ = NULL;
-	GtkListStore* _tmp135_;
-	GtkTreeIter _tmp136_ = {0};
-	GtkListStore* _tmp137_;
-	GtkTreeIter _tmp138_;
-	GtkListStore* _tmp139_;
-	GtkTreeIter _tmp140_ = {0};
-	GtkListStore* _tmp141_;
-	GtkTreeIter _tmp142_;
-	GtkListStore* _tmp143_;
-	GtkTreeIter _tmp144_ = {0};
-	GtkListStore* _tmp145_;
-	GtkTreeIter _tmp146_;
-	GtkListStore* _tmp147_;
-	GtkTreeIter _tmp148_ = {0};
-	GtkListStore* _tmp149_;
-	GtkTreeIter _tmp150_;
-	GtkListStore* _tmp151_;
-	GtkTreeIter _tmp152_ = {0};
-	GtkListStore* _tmp153_;
-	GtkTreeIter _tmp154_;
+	GtkListStore* _tmp150_;
+	GtkTreeIter _tmp151_ = {0};
+	GtkListStore* _tmp152_;
+	GtkTreeIter _tmp153_;
+	const gchar* _tmp154_ = NULL;
 	GtkListStore* _tmp155_;
 	GtkTreeIter _tmp156_ = {0};
 	GtkListStore* _tmp157_;
 	GtkTreeIter _tmp158_;
-	GSettings* _tmp159_;
-	gint _tmp160_ = 0;
-	gint dpi;
-	gint _tmp161_;
-	GtkComboBox* _tmp162_;
-	gint _tmp163_;
-	GSettings* _tmp164_;
-	gint _tmp165_ = 0;
-	gint _tmp166_;
-	GtkComboBox* _tmp167_;
-	gint _tmp168_;
-	GtkCellRendererText* _tmp169_;
-	GtkCellRendererText* renderer;
-	GtkComboBox* _tmp170_;
-	GtkCellRendererText* _tmp171_;
-	GtkComboBox* _tmp172_;
-	GtkCellRendererText* _tmp173_;
-	GtkCellRendererText* _tmp174_;
-	GtkComboBox* _tmp175_;
-	GtkCellRendererText* _tmp176_;
-	GtkComboBox* _tmp177_;
-	GtkCellRendererText* _tmp178_;
+	GtkListStore* _tmp159_;
+	GtkTreeIter _tmp160_ = {0};
+	GtkListStore* _tmp161_;
+	GtkTreeIter _tmp162_;
+	GtkListStore* _tmp163_;
+	GtkTreeIter _tmp164_ = {0};
+	GtkListStore* _tmp165_;
+	GtkTreeIter _tmp166_;
+	GtkListStore* _tmp167_;
+	GtkTreeIter _tmp168_ = {0};
+	GtkListStore* _tmp169_;
+	GtkTreeIter _tmp170_;
+	GtkListStore* _tmp171_;
+	GtkTreeIter _tmp172_ = {0};
+	GtkListStore* _tmp173_;
+	GtkTreeIter _tmp174_;
+	GtkListStore* _tmp175_;
+	GtkTreeIter _tmp176_ = {0};
+	GtkListStore* _tmp177_;
+	GtkTreeIter _tmp178_;
 	GSettings* _tmp179_;
 	gint _tmp180_ = 0;
-	GtkCellRendererText* _tmp181_;
+	gint dpi;
+	gint _tmp181_;
 	GtkComboBox* _tmp182_;
-	GtkCellRendererText* _tmp183_;
-	GtkComboBox* _tmp184_;
-	GtkCellRendererText* _tmp185_;
-	GSettings* _tmp186_;
-	gint _tmp187_ = 0;
+	gint _tmp183_;
+	GSettings* _tmp184_;
+	gint _tmp185_ = 0;
+	gint _tmp186_;
+	GtkComboBox* _tmp187_;
+	gint _tmp188_;
+	GtkCellRendererText* _tmp189_;
+	GtkCellRendererText* renderer;
+	GtkComboBox* _tmp190_;
+	GtkCellRendererText* _tmp191_;
+	GtkComboBox* _tmp192_;
+	GtkCellRendererText* _tmp193_;
+	GtkCellRendererText* _tmp194_;
+	GtkComboBox* _tmp195_;
+	GtkCellRendererText* _tmp196_;
+	GtkComboBox* _tmp197_;
+	GtkCellRendererText* _tmp198_;
+	GSettings* _tmp199_;
+	gint _tmp200_ = 0;
+	GtkCellRendererText* _tmp201_;
+	GtkComboBox* _tmp202_;
+	GtkCellRendererText* _tmp203_;
+	GtkComboBox* _tmp204_;
+	GtkCellRendererText* _tmp205_;
+	GSettings* _tmp206_;
+	gint _tmp207_ = 0;
 	gint paper_width;
-	GSettings* _tmp188_;
-	gint _tmp189_ = 0;
+	GSettings* _tmp208_;
+	gint _tmp209_ = 0;
 	gint paper_height;
-	gint _tmp190_;
-	gint _tmp191_;
-	GSettings* _tmp192_;
-	gchar* _tmp193_ = NULL;
-	gchar* device;
-	const gchar* _tmp194_;
-	GSettings* _tmp200_;
-	gchar* _tmp201_ = NULL;
-	gchar* document_type;
-	const gchar* _tmp202_;
-	Book* _tmp204_;
-	BookView* _tmp205_;
-	BookView* _tmp206_;
-	GtkVBox* _tmp207_;
-	BookView* _tmp208_;
-	BookView* _tmp209_;
-	BookView* _tmp210_;
-	BookView* _tmp211_;
-	BookView* _tmp212_;
-	GSettings* _tmp213_;
-	gint _tmp214_ = 0;
-	GSettings* _tmp215_;
-	gint _tmp216_ = 0;
-	gint _tmp217_;
-	GSettings* _tmp218_;
-	gint _tmp219_ = 0;
-	gint _tmp220_;
-	GSettings* _tmp221_;
-	gint _tmp222_ = 0;
-	gint _tmp223_;
-	GSettings* _tmp224_;
-	gint _tmp225_ = 0;
-	gint _tmp226_;
+	gint _tmp210_;
+	gint _tmp211_;
+	GtkAdjustment* _tmp212_;
+	gdouble _tmp213_ = 0.0;
+	gdouble lower;
+	const gchar* _tmp214_ = NULL;
+	gchar* _tmp215_ = NULL;
+	gchar* darker_label;
+	GtkAdjustment* _tmp216_;
+	gdouble _tmp217_ = 0.0;
+	gdouble upper;
+	const gchar* _tmp218_ = NULL;
+	gchar* _tmp219_ = NULL;
+	gchar* lighter_label;
+	GtkScale* _tmp220_;
+	gdouble _tmp221_;
+	const gchar* _tmp222_;
+	GtkScale* _tmp223_;
+	GtkScale* _tmp224_;
+	gdouble _tmp225_;
+	const gchar* _tmp226_;
 	GSettings* _tmp227_;
 	gint _tmp228_ = 0;
-	gint _tmp229_;
-	gint _tmp230_;
-	gint _tmp231_;
-	GtkWindow* _tmp232_;
-	gint _tmp233_;
-	gint _tmp234_;
-	GSettings* _tmp235_;
-	gboolean _tmp236_ = FALSE;
-	gboolean _tmp237_;
-	Book* _tmp239_;
-	guint _tmp240_ = 0U;
-	Book* _tmp241_;
-	Book* _tmp242_;
-	GtkWindow* _tmp243_;
-	const gchar* _tmp244_ = NULL;
-	ProgressBarDialog* _tmp245_;
-	Book* _tmp246_;
+	GtkAdjustment* _tmp229_;
+	gdouble _tmp230_ = 0.0;
+	const gchar* _tmp231_ = NULL;
+	gchar* _tmp232_ = NULL;
+	gchar* less_label;
+	GtkAdjustment* _tmp233_;
+	gdouble _tmp234_ = 0.0;
+	const gchar* _tmp235_ = NULL;
+	gchar* _tmp236_ = NULL;
+	gchar* more_label;
+	GtkScale* _tmp237_;
+	gdouble _tmp238_;
+	const gchar* _tmp239_;
+	GtkScale* _tmp240_;
+	GtkScale* _tmp241_;
+	gdouble _tmp242_;
+	const gchar* _tmp243_;
+	GSettings* _tmp244_;
+	gint _tmp245_ = 0;
+	GtkAdjustment* _tmp246_;
+	gdouble _tmp247_ = 0.0;
+	const gchar* _tmp248_ = NULL;
+	gchar* _tmp249_ = NULL;
+	gchar* minimum_label;
+	GtkAdjustment* _tmp250_;
+	gdouble _tmp251_ = 0.0;
+	const gchar* _tmp252_ = NULL;
+	gchar* _tmp253_ = NULL;
+	gchar* maximum_label;
+	GtkScale* _tmp254_;
+	gdouble _tmp255_;
+	const gchar* _tmp256_;
+	GtkScale* _tmp257_;
+	GtkScale* _tmp258_;
+	gdouble _tmp259_;
+	const gchar* _tmp260_;
+	GSettings* _tmp261_;
+	gint _tmp262_ = 0;
+	GSettings* _tmp263_;
+	gchar* _tmp264_ = NULL;
+	gchar* device;
+	const gchar* _tmp265_;
+	GSettings* _tmp271_;
+	gchar* _tmp272_ = NULL;
+	gchar* document_type;
+	const gchar* _tmp273_;
+	Book* _tmp275_;
+	BookView* _tmp276_;
+	BookView* _tmp277_;
+	GtkVBox* _tmp278_;
+	BookView* _tmp279_;
+	BookView* _tmp280_;
+	BookView* _tmp281_;
+	BookView* _tmp282_;
+	BookView* _tmp283_;
+	GSettings* _tmp284_;
+	gint _tmp285_ = 0;
+	GSettings* _tmp286_;
+	gint _tmp287_ = 0;
+	gint _tmp288_;
+	GSettings* _tmp289_;
+	gint _tmp290_ = 0;
+	gint _tmp291_;
+	GSettings* _tmp292_;
+	gint _tmp293_ = 0;
+	gint _tmp294_;
+	GSettings* _tmp295_;
+	gint _tmp296_ = 0;
+	gint _tmp297_;
+	GSettings* _tmp298_;
+	gint _tmp299_ = 0;
+	gint _tmp300_;
+	gint _tmp301_;
+	gint _tmp302_;
+	GtkWindow* _tmp303_;
+	gint _tmp304_;
+	gint _tmp305_;
+	GSettings* _tmp306_;
+	gboolean _tmp307_ = FALSE;
+	gboolean _tmp308_;
+	Book* _tmp310_;
+	guint _tmp311_ = 0U;
+	Book* _tmp312_;
+	Book* _tmp313_;
+	GtkWindow* _tmp314_;
+	const gchar* _tmp315_ = NULL;
+	ProgressBarDialog* _tmp316_;
+	Book* _tmp317_;
 	GError * _inner_error_ = NULL;
+#line 1318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 1320 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = gtk_icon_theme_get_default ();
+#line 1320 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_icon_theme_append_search_path (_tmp0_, ICON_DIR);
+#line 1322 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_default_icon_name ("scanner");
+#line 1324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_builder_new ();
+#line 1324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->builder);
+#line 1324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->builder = _tmp1_;
-	_tmp2_ = g_build_filename (UI_DIR, "simple-scan.ui", NULL, NULL);
-	filename = _tmp2_;
+#line 6672 "ui.c"
 	{
-		GtkBuilder* _tmp3_;
-		_tmp3_ = self->priv->builder;
-		gtk_builder_add_from_file (_tmp3_, filename, &_inner_error_);
+		GtkBuilder* _tmp2_;
+#line 1327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp2_ = self->priv->builder;
+#line 1327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_builder_add_from_resource (_tmp2_, "/org/gnome/SimpleScan/simple-scan.ui", &_inner_error_);
+#line 1327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_inner_error_ != NULL) {
-			goto __catch20_g_error;
+#line 6681 "ui.c"
+			goto __catch21_g_error;
 		}
 	}
-	goto __finally20;
-	__catch20_g_error:
+	goto __finally21;
+	__catch21_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp4_;
-		const gchar* _tmp5_;
+		GError* _tmp3_;
+		const gchar* _tmp4_;
+		const gchar* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
+#line 1325 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
+#line 1325 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-		_tmp4_ = e;
-		_tmp5_ = _tmp4_->message;
-		g_critical ("ui.vala:1256: Unable to load UI %s: %s\n", filename, _tmp5_);
-		_tmp6_ = _ ("Files missing");
-		_tmp7_ = _ ("Please check your installation");
-		user_interface_show_error_dialog (self, _tmp6_, _tmp7_);
+#line 1331 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp3_ = e;
+#line 1331 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp4_ = _tmp3_->message;
+#line 1331 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_critical ("ui.vala:1331: Unable to load UI: %s\n", _tmp4_);
+#line 1332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp5_ = _ ("Files missing");
+#line 1332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp6_ = _ ("Please check your installation");
+#line 1332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		user_interface_show_error_dialog (self, _tmp5_, _tmp6_);
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		exit (EXIT_FAILURE);
+#line 1325 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
+#line 6713 "ui.c"
 	}
-	__finally20:
+	__finally21:
+#line 1325 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_inner_error_ != NULL) {
-		_g_free0 (filename);
+#line 1325 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 1325 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
+#line 1325 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
+#line 6724 "ui.c"
 	}
+#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp7_ = self->priv->builder;
+#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_builder_connect_signals (_tmp7_, self);
+#line 1340 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = self->priv->builder;
-	gtk_builder_connect_signals (_tmp8_, self);
-	_tmp9_ = self->priv->builder;
-	_tmp10_ = gtk_builder_get_object (_tmp9_, "simple_scan_window");
-	_tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GTK_TYPE_WINDOW, GtkWindow));
+#line 1340 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp9_ = gtk_builder_get_object (_tmp8_, "simple_scan_window");
+#line 1340 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_WINDOW, GtkWindow));
+#line 1340 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->window);
-	self->priv->window = _tmp11_;
-	_tmp12_ = g_application_get_default ();
-	_tmp13_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, GTK_TYPE_APPLICATION) ? ((GtkApplication*) _tmp12_) : NULL);
-	app = _tmp13_;
-	_tmp14_ = app;
-	_tmp15_ = self->priv->window;
-	gtk_application_add_window (_tmp14_, _tmp15_);
-	_tmp16_ = self->priv->builder;
-	_tmp17_ = gtk_builder_get_object (_tmp16_, "main_vbox");
-	_tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GTK_TYPE_VBOX, GtkVBox));
+#line 1340 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->window = _tmp10_;
+#line 1341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp11_ = g_application_get_default ();
+#line 1341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, GTK_TYPE_APPLICATION) ? ((GtkApplication*) _tmp11_) : NULL);
+#line 1341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	app = _tmp12_;
+#line 1342 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp13_ = app;
+#line 1342 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp14_ = self->priv->window;
+#line 1342 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_application_add_window (_tmp13_, _tmp14_);
+#line 1343 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp15_ = self->priv->builder;
+#line 1343 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp16_ = gtk_builder_get_object (_tmp15_, "main_vbox");
+#line 1343 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp17_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GTK_TYPE_VBOX, GtkVBox));
+#line 1343 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->main_vbox);
-	self->priv->main_vbox = _tmp18_;
-	_tmp19_ = self->priv->builder;
-	_tmp20_ = gtk_builder_get_object (_tmp19_, "page_move_left_menuitem");
-	_tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GTK_TYPE_MENU_ITEM, GtkMenuItem));
+#line 1343 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->main_vbox = _tmp17_;
+#line 1344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp18_ = self->priv->builder;
+#line 1344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp19_ = gtk_builder_get_object (_tmp18_, "page_move_left_menuitem");
+#line 1344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp20_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GTK_TYPE_MENU_ITEM, GtkMenuItem));
+#line 1344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->page_move_left_menuitem);
-	self->priv->page_move_left_menuitem = _tmp21_;
-	_tmp22_ = self->priv->builder;
-	_tmp23_ = gtk_builder_get_object (_tmp22_, "page_move_right_menuitem");
-	_tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GTK_TYPE_MENU_ITEM, GtkMenuItem));
+#line 1344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->page_move_left_menuitem = _tmp20_;
+#line 1345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp21_ = self->priv->builder;
+#line 1345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp22_ = gtk_builder_get_object (_tmp21_, "page_move_right_menuitem");
+#line 1345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp23_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GTK_TYPE_MENU_ITEM, GtkMenuItem));
+#line 1345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->page_move_right_menuitem);
-	self->priv->page_move_right_menuitem = _tmp24_;
-	_tmp25_ = self->priv->builder;
-	_tmp26_ = gtk_builder_get_object (_tmp25_, "page_delete_menuitem");
-	_tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GTK_TYPE_MENU_ITEM, GtkMenuItem));
+#line 1345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->page_move_right_menuitem = _tmp23_;
+#line 1346 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp24_ = self->priv->builder;
+#line 1346 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp25_ = gtk_builder_get_object (_tmp24_, "page_delete_menuitem");
+#line 1346 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp26_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GTK_TYPE_MENU_ITEM, GtkMenuItem));
+#line 1346 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->page_delete_menuitem);
-	self->priv->page_delete_menuitem = _tmp27_;
-	_tmp28_ = self->priv->builder;
-	_tmp29_ = gtk_builder_get_object (_tmp28_, "crop_rotate_menuitem");
-	_tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GTK_TYPE_MENU_ITEM, GtkMenuItem));
+#line 1346 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->page_delete_menuitem = _tmp26_;
+#line 1347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp27_ = self->priv->builder;
+#line 1347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp28_ = gtk_builder_get_object (_tmp27_, "crop_rotate_menuitem");
+#line 1347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp29_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GTK_TYPE_MENU_ITEM, GtkMenuItem));
+#line 1347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->crop_rotate_menuitem);
-	self->priv->crop_rotate_menuitem = _tmp30_;
-	_tmp31_ = self->priv->builder;
-	_tmp32_ = gtk_builder_get_object (_tmp31_, "save_menuitem");
-	_tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GTK_TYPE_MENU_ITEM, GtkMenuItem));
+#line 1347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->crop_rotate_menuitem = _tmp29_;
+#line 1348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp30_ = self->priv->builder;
+#line 1348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp31_ = gtk_builder_get_object (_tmp30_, "save_menuitem");
+#line 1348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp32_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GTK_TYPE_MENU_ITEM, GtkMenuItem));
+#line 1348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->save_menuitem);
-	self->priv->save_menuitem = _tmp33_;
-	_tmp34_ = self->priv->builder;
-	_tmp35_ = gtk_builder_get_object (_tmp34_, "save_as_menuitem");
-	_tmp36_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GTK_TYPE_MENU_ITEM, GtkMenuItem));
+#line 1348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->save_menuitem = _tmp32_;
+#line 1349 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp33_ = self->priv->builder;
+#line 1349 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp34_ = gtk_builder_get_object (_tmp33_, "save_as_menuitem");
+#line 1349 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp35_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GTK_TYPE_MENU_ITEM, GtkMenuItem));
+#line 1349 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->save_as_menuitem);
-	self->priv->save_as_menuitem = _tmp36_;
-	_tmp37_ = self->priv->builder;
-	_tmp38_ = gtk_builder_get_object (_tmp37_, "save_toolbutton");
-	_tmp39_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GTK_TYPE_TOOL_BUTTON, GtkToolButton));
+#line 1349 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->save_as_menuitem = _tmp35_;
+#line 1350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp36_ = self->priv->builder;
+#line 1350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp37_ = gtk_builder_get_object (_tmp36_, "copy_to_clipboard_menuitem");
+#line 1350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp38_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GTK_TYPE_MENU_ITEM, GtkMenuItem));
+#line 1350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->copy_to_clipboard_menuitem);
+#line 1350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->copy_to_clipboard_menuitem = _tmp38_;
+#line 1351 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp39_ = self->priv->builder;
+#line 1351 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp40_ = gtk_builder_get_object (_tmp39_, "save_toolbutton");
+#line 1351 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp41_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GTK_TYPE_TOOL_BUTTON, GtkToolButton));
+#line 1351 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->save_toolbutton);
-	self->priv->save_toolbutton = _tmp39_;
-	_tmp40_ = self->priv->builder;
-	_tmp41_ = gtk_builder_get_object (_tmp40_, "stop_scan_menuitem");
-	_tmp42_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GTK_TYPE_MENU_ITEM, GtkMenuItem));
+#line 1351 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->save_toolbutton = _tmp41_;
+#line 1352 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp42_ = self->priv->builder;
+#line 1352 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp43_ = gtk_builder_get_object (_tmp42_, "stop_scan_menuitem");
+#line 1352 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp44_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GTK_TYPE_MENU_ITEM, GtkMenuItem));
+#line 1352 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->stop_menuitem);
-	self->priv->stop_menuitem = _tmp42_;
-	_tmp43_ = self->priv->builder;
-	_tmp44_ = gtk_builder_get_object (_tmp43_, "stop_toolbutton");
-	_tmp45_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GTK_TYPE_TOOL_BUTTON, GtkToolButton));
+#line 1352 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->stop_menuitem = _tmp44_;
+#line 1353 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp45_ = self->priv->builder;
+#line 1353 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp46_ = gtk_builder_get_object (_tmp45_, "stop_toolbutton");
+#line 1353 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp47_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GTK_TYPE_TOOL_BUTTON, GtkToolButton));
+#line 1353 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->stop_toolbutton);
-	self->priv->stop_toolbutton = _tmp45_;
-	_tmp46_ = self->priv->builder;
-	_tmp47_ = gtk_builder_get_object (_tmp46_, "text_toolbutton_menuitem");
-	_tmp48_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItem));
+#line 1353 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->stop_toolbutton = _tmp47_;
+#line 1355 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp48_ = self->priv->builder;
+#line 1355 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp49_ = gtk_builder_get_object (_tmp48_, "text_toolbutton_menuitem");
+#line 1355 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp50_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItem));
+#line 1355 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->text_toolbar_menuitem);
-	self->priv->text_toolbar_menuitem = _tmp48_;
-	_tmp49_ = self->priv->builder;
-	_tmp50_ = gtk_builder_get_object (_tmp49_, "text_menuitem");
-	_tmp51_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItem));
+#line 1355 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->text_toolbar_menuitem = _tmp50_;
+#line 1356 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp51_ = self->priv->builder;
+#line 1356 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp52_ = gtk_builder_get_object (_tmp51_, "text_menuitem");
+#line 1356 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp53_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItem));
+#line 1356 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->text_menu_menuitem);
-	self->priv->text_menu_menuitem = _tmp51_;
-	_tmp52_ = self->priv->builder;
-	_tmp53_ = gtk_builder_get_object (_tmp52_, "photo_toolbutton_menuitem");
-	_tmp54_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItem));
+#line 1356 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->text_menu_menuitem = _tmp53_;
+#line 1357 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp54_ = self->priv->builder;
+#line 1357 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp55_ = gtk_builder_get_object (_tmp54_, "photo_toolbutton_menuitem");
+#line 1357 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp56_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItem));
+#line 1357 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->photo_toolbar_menuitem);
-	self->priv->photo_toolbar_menuitem = _tmp54_;
-	_tmp55_ = self->priv->builder;
-	_tmp56_ = gtk_builder_get_object (_tmp55_, "photo_menuitem");
-	_tmp57_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItem));
+#line 1357 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->photo_toolbar_menuitem = _tmp56_;
+#line 1358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp57_ = self->priv->builder;
+#line 1358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp58_ = gtk_builder_get_object (_tmp57_, "photo_menuitem");
+#line 1358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp59_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItem));
+#line 1358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->photo_menu_menuitem);
-	self->priv->photo_menu_menuitem = _tmp57_;
-	_tmp58_ = self->priv->builder;
-	_tmp59_ = gtk_builder_get_object (_tmp58_, "authorize_dialog");
-	_tmp60_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GTK_TYPE_DIALOG, GtkDialog));
+#line 1358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->photo_menu_menuitem = _tmp59_;
+#line 1360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp60_ = self->priv->builder;
+#line 1360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp61_ = gtk_builder_get_object (_tmp60_, "authorize_dialog");
+#line 1360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp62_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GTK_TYPE_DIALOG, GtkDialog));
+#line 1360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->authorize_dialog);
-	self->priv->authorize_dialog = _tmp60_;
-	_tmp61_ = self->priv->builder;
-	_tmp62_ = gtk_builder_get_object (_tmp61_, "authorize_label");
-	_tmp63_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, GTK_TYPE_LABEL, GtkLabel));
+#line 1360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->authorize_dialog = _tmp62_;
+#line 1361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp63_ = self->priv->builder;
+#line 1361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp64_ = gtk_builder_get_object (_tmp63_, "authorize_label");
+#line 1361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp65_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, GTK_TYPE_LABEL, GtkLabel));
+#line 1361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->authorize_label);
-	self->priv->authorize_label = _tmp63_;
-	_tmp64_ = self->priv->builder;
-	_tmp65_ = gtk_builder_get_object (_tmp64_, "username_entry");
-	_tmp66_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, GTK_TYPE_ENTRY, GtkEntry));
+#line 1361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->authorize_label = _tmp65_;
+#line 1362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp66_ = self->priv->builder;
+#line 1362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp67_ = gtk_builder_get_object (_tmp66_, "username_entry");
+#line 1362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp68_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, GTK_TYPE_ENTRY, GtkEntry));
+#line 1362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->username_entry);
-	self->priv->username_entry = _tmp66_;
-	_tmp67_ = self->priv->builder;
-	_tmp68_ = gtk_builder_get_object (_tmp67_, "password_entry");
-	_tmp69_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GTK_TYPE_ENTRY, GtkEntry));
+#line 1362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->username_entry = _tmp68_;
+#line 1363 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp69_ = self->priv->builder;
+#line 1363 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp70_ = gtk_builder_get_object (_tmp69_, "password_entry");
+#line 1363 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp71_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, GTK_TYPE_ENTRY, GtkEntry));
+#line 1363 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->password_entry);
-	self->priv->password_entry = _tmp69_;
-	_tmp70_ = self->priv->builder;
-	_tmp71_ = gtk_builder_get_object (_tmp70_, "preferences_dialog");
-	_tmp72_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, GTK_TYPE_DIALOG, GtkDialog));
+#line 1363 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->password_entry = _tmp71_;
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp72_ = self->priv->builder;
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp73_ = gtk_builder_get_object (_tmp72_, "preferences_dialog");
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp74_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, GTK_TYPE_DIALOG, GtkDialog));
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->preferences_dialog);
-	self->priv->preferences_dialog = _tmp72_;
-	_tmp73_ = self->priv->builder;
-	_tmp74_ = gtk_builder_get_object (_tmp73_, "device_combo");
-	_tmp75_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GTK_TYPE_COMBO_BOX, GtkComboBox));
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->preferences_dialog = _tmp74_;
+#line 1366 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp75_ = self->priv->builder;
+#line 1366 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp76_ = gtk_builder_get_object (_tmp75_, "device_combo");
+#line 1366 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp77_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, GTK_TYPE_COMBO_BOX, GtkComboBox));
+#line 1366 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->device_combo);
-	self->priv->device_combo = _tmp75_;
-	_tmp76_ = self->priv->device_combo;
-	_tmp77_ = gtk_combo_box_get_model (_tmp76_);
-	_tmp78_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, GTK_TYPE_LIST_STORE, GtkListStore));
+#line 1366 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->device_combo = _tmp77_;
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp78_ = self->priv->device_combo;
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp79_ = gtk_combo_box_get_model (_tmp78_);
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp80_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, GTK_TYPE_LIST_STORE, GtkListStore));
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->device_model);
-	self->priv->device_model = _tmp78_;
-	_tmp79_ = self->priv->builder;
-	_tmp80_ = gtk_builder_get_object (_tmp79_, "text_dpi_combo");
-	_tmp81_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, GTK_TYPE_COMBO_BOX, GtkComboBox));
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->device_model = _tmp80_;
+#line 1368 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp81_ = self->priv->builder;
+#line 1368 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp82_ = gtk_builder_get_object (_tmp81_, "text_dpi_combo");
+#line 1368 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp83_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, GTK_TYPE_COMBO_BOX, GtkComboBox));
+#line 1368 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->text_dpi_combo);
-	self->priv->text_dpi_combo = _tmp81_;
-	_tmp82_ = self->priv->text_dpi_combo;
-	_tmp83_ = gtk_combo_box_get_model (_tmp82_);
-	_tmp84_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, GTK_TYPE_LIST_STORE, GtkListStore));
+#line 1368 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->text_dpi_combo = _tmp83_;
+#line 1369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp84_ = self->priv->text_dpi_combo;
+#line 1369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp85_ = gtk_combo_box_get_model (_tmp84_);
+#line 1369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp86_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, GTK_TYPE_LIST_STORE, GtkListStore));
+#line 1369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->text_dpi_model);
-	self->priv->text_dpi_model = _tmp84_;
-	_tmp85_ = self->priv->builder;
-	_tmp86_ = gtk_builder_get_object (_tmp85_, "photo_dpi_combo");
-	_tmp87_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, GTK_TYPE_COMBO_BOX, GtkComboBox));
+#line 1369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->text_dpi_model = _tmp86_;
+#line 1370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp87_ = self->priv->builder;
+#line 1370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp88_ = gtk_builder_get_object (_tmp87_, "photo_dpi_combo");
+#line 1370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp89_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, GTK_TYPE_COMBO_BOX, GtkComboBox));
+#line 1370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->photo_dpi_combo);
-	self->priv->photo_dpi_combo = _tmp87_;
-	_tmp88_ = self->priv->photo_dpi_combo;
-	_tmp89_ = gtk_combo_box_get_model (_tmp88_);
-	_tmp90_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp89_, GTK_TYPE_LIST_STORE, GtkListStore));
+#line 1370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->photo_dpi_combo = _tmp89_;
+#line 1371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp90_ = self->priv->photo_dpi_combo;
+#line 1371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp91_ = gtk_combo_box_get_model (_tmp90_);
+#line 1371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp92_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp91_, GTK_TYPE_LIST_STORE, GtkListStore));
+#line 1371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->photo_dpi_model);
-	self->priv->photo_dpi_model = _tmp90_;
-	_tmp91_ = self->priv->builder;
-	_tmp92_ = gtk_builder_get_object (_tmp91_, "page_side_combo");
-	_tmp93_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp92_, GTK_TYPE_COMBO_BOX, GtkComboBox));
+#line 1371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->photo_dpi_model = _tmp92_;
+#line 1372 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp93_ = self->priv->builder;
+#line 1372 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp94_ = gtk_builder_get_object (_tmp93_, "page_side_combo");
+#line 1372 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp95_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp94_, GTK_TYPE_COMBO_BOX, GtkComboBox));
+#line 1372 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->page_side_combo);
-	self->priv->page_side_combo = _tmp93_;
-	_tmp94_ = self->priv->page_side_combo;
-	_tmp95_ = gtk_combo_box_get_model (_tmp94_);
-	_tmp96_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp95_, GTK_TYPE_LIST_STORE, GtkListStore));
+#line 1372 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->page_side_combo = _tmp95_;
+#line 1373 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp96_ = self->priv->page_side_combo;
+#line 1373 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp97_ = gtk_combo_box_get_model (_tmp96_);
+#line 1373 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp98_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp97_, GTK_TYPE_LIST_STORE, GtkListStore));
+#line 1373 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->page_side_model);
-	self->priv->page_side_model = _tmp96_;
-	_tmp97_ = self->priv->builder;
-	_tmp98_ = gtk_builder_get_object (_tmp97_, "paper_size_combo");
-	_tmp99_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp98_, GTK_TYPE_COMBO_BOX, GtkComboBox));
+#line 1373 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->page_side_model = _tmp98_;
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp99_ = self->priv->builder;
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp100_ = gtk_builder_get_object (_tmp99_, "paper_size_combo");
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp101_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, GTK_TYPE_COMBO_BOX, GtkComboBox));
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->paper_size_combo);
-	self->priv->paper_size_combo = _tmp99_;
-	_tmp100_ = self->priv->paper_size_combo;
-	_tmp101_ = gtk_combo_box_get_model (_tmp100_);
-	_tmp102_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp101_, GTK_TYPE_LIST_STORE, GtkListStore));
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->paper_size_combo = _tmp101_;
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp102_ = self->priv->paper_size_combo;
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp103_ = gtk_combo_box_get_model (_tmp102_);
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp104_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp103_, GTK_TYPE_LIST_STORE, GtkListStore));
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->paper_size_model);
-	self->priv->paper_size_model = _tmp102_;
-	_tmp103_ = (GtkInfoBar*) gtk_info_bar_new ();
-	g_object_ref_sink (_tmp103_);
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->paper_size_model = _tmp104_;
+#line 1376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp105_ = self->priv->builder;
+#line 1376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp106_ = gtk_builder_get_object (_tmp105_, "brightness_scale");
+#line 1376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp107_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp106_, GTK_TYPE_SCALE, GtkScale));
+#line 1376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->brightness_scale);
+#line 1376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->brightness_scale = _tmp107_;
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp108_ = self->priv->brightness_scale;
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp109_ = gtk_range_get_adjustment ((GtkRange*) _tmp108_);
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp110_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, GTK_TYPE_ADJUSTMENT, GtkAdjustment));
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->brightness_adjustment);
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->brightness_adjustment = _tmp110_;
+#line 1378 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp111_ = self->priv->builder;
+#line 1378 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp112_ = gtk_builder_get_object (_tmp111_, "contrast_scale");
+#line 1378 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp113_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, GTK_TYPE_SCALE, GtkScale));
+#line 1378 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->contrast_scale);
+#line 1378 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->contrast_scale = _tmp113_;
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp114_ = self->priv->contrast_scale;
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp115_ = gtk_range_get_adjustment ((GtkRange*) _tmp114_);
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp116_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp115_, GTK_TYPE_ADJUSTMENT, GtkAdjustment));
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->contrast_adjustment);
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->contrast_adjustment = _tmp116_;
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp117_ = self->priv->builder;
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp118_ = gtk_builder_get_object (_tmp117_, "quality_scale");
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp119_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp118_, GTK_TYPE_SCALE, GtkScale));
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->quality_scale);
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->quality_scale = _tmp119_;
+#line 1381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp120_ = self->priv->quality_scale;
+#line 1381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp121_ = gtk_range_get_adjustment ((GtkRange*) _tmp120_);
+#line 1381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp122_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, GTK_TYPE_ADJUSTMENT, GtkAdjustment));
+#line 1381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->quality_adjustment);
+#line 1381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->quality_adjustment = _tmp122_;
+#line 1384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp123_ = (GtkInfoBar*) gtk_info_bar_new ();
+#line 1384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp123_);
+#line 1384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar);
-	self->priv->info_bar = _tmp103_;
-	_tmp104_ = self->priv->info_bar;
-	g_signal_connect (_tmp104_, "response", (GCallback) _user_interface_info_bar_response_cb_gtk_info_bar_response, self);
-	_tmp105_ = self->priv->main_vbox;
-	_tmp106_ = self->priv->info_bar;
-	gtk_box_pack_start ((GtkBox*) _tmp105_, (GtkWidget*) _tmp106_, FALSE, TRUE, (guint) 0);
-	_tmp107_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-	g_object_ref_sink (_tmp107_);
-	hbox = _tmp107_;
-	_tmp108_ = self->priv->info_bar;
-	_tmp109_ = gtk_info_bar_get_content_area (_tmp108_);
-	_tmp110_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, GTK_TYPE_CONTAINER, GtkContainer));
-	content_area = _tmp110_;
-	_tmp111_ = content_area;
-	_tmp112_ = hbox;
-	gtk_container_add (_tmp111_, (GtkWidget*) _tmp112_);
-	_tmp113_ = hbox;
-	gtk_widget_show ((GtkWidget*) _tmp113_);
-	_tmp114_ = (GtkImage*) gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_DIALOG);
-	g_object_ref_sink (_tmp114_);
+#line 1384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->info_bar = _tmp123_;
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp124_ = self->priv->info_bar;
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect (_tmp124_, "response", (GCallback) _user_interface_info_bar_response_cb_gtk_info_bar_response, self);
+#line 1386 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp125_ = self->priv->main_vbox;
+#line 1386 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp126_ = self->priv->info_bar;
+#line 1386 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_box_pack_start ((GtkBox*) _tmp125_, (GtkWidget*) _tmp126_, FALSE, TRUE, (guint) 0);
+#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp127_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp127_);
+#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	hbox = _tmp127_;
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp128_ = self->priv->info_bar;
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp129_ = gtk_info_bar_get_content_area (_tmp128_);
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp130_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp129_, GTK_TYPE_CONTAINER, GtkContainer));
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	content_area = _tmp130_;
+#line 1389 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp131_ = content_area;
+#line 1389 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp132_ = hbox;
+#line 1389 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_container_add (_tmp131_, (GtkWidget*) _tmp132_);
+#line 1390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp133_ = hbox;
+#line 1390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_show ((GtkWidget*) _tmp133_);
+#line 1392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp134_ = (GtkImage*) gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_DIALOG);
+#line 1392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp134_);
+#line 1392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_image);
-	self->priv->info_bar_image = _tmp114_;
-	_tmp115_ = hbox;
-	_tmp116_ = self->priv->info_bar_image;
-	gtk_box_pack_start (_tmp115_, (GtkWidget*) _tmp116_, FALSE, TRUE, (guint) 0);
-	_tmp117_ = self->priv->info_bar_image;
-	gtk_widget_show ((GtkWidget*) _tmp117_);
-	_tmp118_ = (GtkLabel*) gtk_label_new (NULL);
-	g_object_ref_sink (_tmp118_);
+#line 1392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->info_bar_image = _tmp134_;
+#line 1393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp135_ = hbox;
+#line 1393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp136_ = self->priv->info_bar_image;
+#line 1393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_box_pack_start (_tmp135_, (GtkWidget*) _tmp136_, FALSE, TRUE, (guint) 0);
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp137_ = self->priv->info_bar_image;
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_show ((GtkWidget*) _tmp137_);
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp138_ = (GtkLabel*) gtk_label_new (NULL);
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp138_);
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_label);
-	self->priv->info_bar_label = _tmp118_;
-	_tmp119_ = self->priv->info_bar_label;
-	gtk_misc_set_alignment ((GtkMisc*) _tmp119_, 0.0f, 0.5f);
-	_tmp120_ = hbox;
-	_tmp121_ = self->priv->info_bar_label;
-	gtk_box_pack_start (_tmp120_, (GtkWidget*) _tmp121_, TRUE, TRUE, (guint) 0);
-	_tmp122_ = self->priv->info_bar_label;
-	gtk_widget_show ((GtkWidget*) _tmp122_);
-	_tmp123_ = self->priv->info_bar;
-	_tmp124_ = gtk_info_bar_add_button (_tmp123_, GTK_STOCK_CLOSE, (gint) GTK_RESPONSE_CLOSE);
-	_tmp125_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp124_, GTK_TYPE_BUTTON, GtkButton));
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->info_bar_label = _tmp138_;
+#line 1397 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp139_ = self->priv->info_bar_label;
+#line 1397 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_misc_set_alignment ((GtkMisc*) _tmp139_, 0.0f, 0.5f);
+#line 1398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp140_ = hbox;
+#line 1398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp141_ = self->priv->info_bar_label;
+#line 1398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_box_pack_start (_tmp140_, (GtkWidget*) _tmp141_, TRUE, TRUE, (guint) 0);
+#line 1399 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp142_ = self->priv->info_bar_label;
+#line 1399 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_show ((GtkWidget*) _tmp142_);
+#line 1401 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp143_ = self->priv->info_bar;
+#line 1401 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp144_ = gtk_info_bar_add_button (_tmp143_, GTK_STOCK_CLOSE, (gint) GTK_RESPONSE_CLOSE);
+#line 1401 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp145_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp144_, GTK_TYPE_BUTTON, GtkButton));
+#line 1401 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_close_button);
-	self->priv->info_bar_close_button = _tmp125_;
-	_tmp126_ = self->priv->info_bar;
-	_tmp127_ = _ ("Change _Scanner");
-	_tmp128_ = gtk_info_bar_add_button (_tmp126_, _tmp127_, 1);
-	_tmp129_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp128_, GTK_TYPE_BUTTON, GtkButton));
+#line 1401 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->info_bar_close_button = _tmp145_;
+#line 1402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp146_ = self->priv->info_bar;
+#line 1402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp147_ = _ ("Change _Scanner");
+#line 1402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp148_ = gtk_info_bar_add_button (_tmp146_, _tmp147_, 1);
+#line 1402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp149_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp148_, GTK_TYPE_BUTTON, GtkButton));
+#line 1402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_change_scanner_button);
-	self->priv->info_bar_change_scanner_button = _tmp129_;
-	_tmp130_ = self->priv->paper_size_model;
-	gtk_list_store_append (_tmp130_, &_tmp131_);
-	iter = _tmp131_;
-	_tmp132_ = self->priv->paper_size_model;
-	_tmp133_ = iter;
-	_tmp134_ = _ ("Automatic");
-	gtk_list_store_set (_tmp132_, &_tmp133_, 0, 0, 1, 0, 2, _tmp134_, -1, -1);
-	_tmp135_ = self->priv->paper_size_model;
-	gtk_list_store_append (_tmp135_, &_tmp136_);
-	iter = _tmp136_;
-	_tmp137_ = self->priv->paper_size_model;
-	_tmp138_ = iter;
-	gtk_list_store_set (_tmp137_, &_tmp138_, 0, 1050, 1, 1480, 2, "A6", -1, -1);
-	_tmp139_ = self->priv->paper_size_model;
-	gtk_list_store_append (_tmp139_, &_tmp140_);
-	iter = _tmp140_;
-	_tmp141_ = self->priv->paper_size_model;
-	_tmp142_ = iter;
-	gtk_list_store_set (_tmp141_, &_tmp142_, 0, 1480, 1, 2100, 2, "A5", -1, -1);
-	_tmp143_ = self->priv->paper_size_model;
-	gtk_list_store_append (_tmp143_, &_tmp144_);
-	iter = _tmp144_;
-	_tmp145_ = self->priv->paper_size_model;
-	_tmp146_ = iter;
-	gtk_list_store_set (_tmp145_, &_tmp146_, 0, 2100, 1, 2970, 2, "A4", -1, -1);
-	_tmp147_ = self->priv->paper_size_model;
-	gtk_list_store_append (_tmp147_, &_tmp148_);
-	iter = _tmp148_;
-	_tmp149_ = self->priv->paper_size_model;
-	_tmp150_ = iter;
-	gtk_list_store_set (_tmp149_, &_tmp150_, 0, 2159, 1, 2794, 2, "Letter", -1, -1);
-	_tmp151_ = self->priv->paper_size_model;
-	gtk_list_store_append (_tmp151_, &_tmp152_);
-	iter = _tmp152_;
-	_tmp153_ = self->priv->paper_size_model;
-	_tmp154_ = iter;
-	gtk_list_store_set (_tmp153_, &_tmp154_, 0, 2159, 1, 3556, 2, "Legal", -1, -1);
+#line 1402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->info_bar_change_scanner_button = _tmp149_;
+#line 1406 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp150_ = self->priv->paper_size_model;
+#line 1406 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_append (_tmp150_, &_tmp151_);
+#line 1406 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp151_;
+#line 1407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp152_ = self->priv->paper_size_model;
+#line 1407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp153_ = iter;
+#line 1407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp154_ = _ ("Automatic");
+#line 1407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_set (_tmp152_, &_tmp153_, 0, 0, 1, 0, 2, _tmp154_, -1, -1);
+#line 1410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp155_ = self->priv->paper_size_model;
+#line 1410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp155_, &_tmp156_);
+#line 1410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp156_;
+#line 1411 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp157_ = self->priv->paper_size_model;
+#line 1411 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp158_ = iter;
-	gtk_list_store_set (_tmp157_, &_tmp158_, 0, 1016, 1, 1524, 2, "4×6", -1, -1);
-	_tmp159_ = self->priv->settings;
-	_tmp160_ = g_settings_get_int (_tmp159_, "text-dpi");
-	dpi = _tmp160_;
-	_tmp161_ = dpi;
-	if (_tmp161_ <= 0) {
+#line 1411 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_set (_tmp157_, &_tmp158_, 0, 1050, 1, 1480, 2, "A6", -1, -1);
+#line 1412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp159_ = self->priv->paper_size_model;
+#line 1412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_append (_tmp159_, &_tmp160_);
+#line 1412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp160_;
+#line 1413 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp161_ = self->priv->paper_size_model;
+#line 1413 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp162_ = iter;
+#line 1413 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_set (_tmp161_, &_tmp162_, 0, 1480, 1, 2100, 2, "A5", -1, -1);
+#line 1414 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp163_ = self->priv->paper_size_model;
+#line 1414 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_append (_tmp163_, &_tmp164_);
+#line 1414 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp164_;
+#line 1415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp165_ = self->priv->paper_size_model;
+#line 1415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp166_ = iter;
+#line 1415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_set (_tmp165_, &_tmp166_, 0, 2100, 1, 2970, 2, "A4", -1, -1);
+#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp167_ = self->priv->paper_size_model;
+#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_append (_tmp167_, &_tmp168_);
+#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp168_;
+#line 1417 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp169_ = self->priv->paper_size_model;
+#line 1417 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp170_ = iter;
+#line 1417 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_set (_tmp169_, &_tmp170_, 0, 2159, 1, 2794, 2, "Letter", -1, -1);
+#line 1418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp171_ = self->priv->paper_size_model;
+#line 1418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_append (_tmp171_, &_tmp172_);
+#line 1418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp172_;
+#line 1419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp173_ = self->priv->paper_size_model;
+#line 1419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp174_ = iter;
+#line 1419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_set (_tmp173_, &_tmp174_, 0, 2159, 1, 3556, 2, "Legal", -1, -1);
+#line 1420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp175_ = self->priv->paper_size_model;
+#line 1420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_append (_tmp175_, &_tmp176_);
+#line 1420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp176_;
+#line 1421 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp177_ = self->priv->paper_size_model;
+#line 1421 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp178_ = iter;
+#line 1421 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_set (_tmp177_, &_tmp178_, 0, 1016, 1, 1524, 2, "4×6", -1, -1);
+#line 1423 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp179_ = self->priv->settings;
+#line 1423 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp180_ = g_settings_get_int (_tmp179_, "text-dpi");
+#line 1423 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	dpi = _tmp180_;
+#line 1424 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp181_ = dpi;
+#line 1424 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp181_ <= 0) {
+#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		dpi = USER_INTERFACE_DEFAULT_TEXT_DPI;
-	}
-	_tmp162_ = self->priv->text_dpi_combo;
-	_tmp163_ = dpi;
-	user_interface_set_dpi_combo (self, _tmp162_, USER_INTERFACE_DEFAULT_TEXT_DPI, _tmp163_);
-	_tmp164_ = self->priv->settings;
-	_tmp165_ = g_settings_get_int (_tmp164_, "photo-dpi");
-	dpi = _tmp165_;
-	_tmp166_ = dpi;
-	if (_tmp166_ <= 0) {
+#line 7314 "ui.c"
+	}
+#line 1426 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp182_ = self->priv->text_dpi_combo;
+#line 1426 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp183_ = dpi;
+#line 1426 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_set_dpi_combo (self, _tmp182_, USER_INTERFACE_DEFAULT_TEXT_DPI, _tmp183_);
+#line 1427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp184_ = self->priv->settings;
+#line 1427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp185_ = g_settings_get_int (_tmp184_, "photo-dpi");
+#line 1427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	dpi = _tmp185_;
+#line 1428 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp186_ = dpi;
+#line 1428 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp186_ <= 0) {
+#line 1429 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		dpi = USER_INTERFACE_DEFAULT_PHOTO_DPI;
-	}
-	_tmp167_ = self->priv->photo_dpi_combo;
-	_tmp168_ = dpi;
-	user_interface_set_dpi_combo (self, _tmp167_, USER_INTERFACE_DEFAULT_PHOTO_DPI, _tmp168_);
-	_tmp169_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-	g_object_ref_sink (_tmp169_);
-	renderer = _tmp169_;
-	_tmp170_ = self->priv->device_combo;
-	_tmp171_ = renderer;
-	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp170_, (GtkCellRenderer*) _tmp171_, TRUE);
-	_tmp172_ = self->priv->device_combo;
-	_tmp173_ = renderer;
-	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp172_, (GtkCellRenderer*) _tmp173_, "text", 1);
-	_tmp174_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-	g_object_ref_sink (_tmp174_);
+#line 7334 "ui.c"
+	}
+#line 1430 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp187_ = self->priv->photo_dpi_combo;
+#line 1430 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp188_ = dpi;
+#line 1430 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_set_dpi_combo (self, _tmp187_, USER_INTERFACE_DEFAULT_PHOTO_DPI, _tmp188_);
+#line 1432 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp189_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
+#line 1432 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp189_);
+#line 1432 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	renderer = _tmp189_;
+#line 1433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp190_ = self->priv->device_combo;
+#line 1433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp191_ = renderer;
+#line 1433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp190_, (GtkCellRenderer*) _tmp191_, TRUE);
+#line 1434 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp192_ = self->priv->device_combo;
+#line 1434 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp193_ = renderer;
+#line 1434 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp192_, (GtkCellRenderer*) _tmp193_, "text", 1);
+#line 1436 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp194_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
+#line 1436 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp194_);
+#line 1436 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (renderer);
-	renderer = _tmp174_;
-	_tmp175_ = self->priv->page_side_combo;
-	_tmp176_ = renderer;
-	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp175_, (GtkCellRenderer*) _tmp176_, TRUE);
-	_tmp177_ = self->priv->page_side_combo;
-	_tmp178_ = renderer;
-	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp177_, (GtkCellRenderer*) _tmp178_, "text", 1);
-	_tmp179_ = self->priv->settings;
-	_tmp180_ = g_settings_get_enum (_tmp179_, "page-side");
-	user_interface_set_page_side (self, (ScanType) _tmp180_);
-	_tmp181_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-	g_object_ref_sink (_tmp181_);
+#line 1436 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	renderer = _tmp194_;
+#line 1437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp195_ = self->priv->page_side_combo;
+#line 1437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp196_ = renderer;
+#line 1437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp195_, (GtkCellRenderer*) _tmp196_, TRUE);
+#line 1438 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp197_ = self->priv->page_side_combo;
+#line 1438 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp198_ = renderer;
+#line 1438 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp197_, (GtkCellRenderer*) _tmp198_, "text", 1);
+#line 1439 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp199_ = self->priv->settings;
+#line 1439 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp200_ = g_settings_get_enum (_tmp199_, "page-side");
+#line 1439 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_set_page_side (self, (ScanType) _tmp200_);
+#line 1441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp201_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
+#line 1441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp201_);
+#line 1441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (renderer);
-	renderer = _tmp181_;
-	_tmp182_ = self->priv->paper_size_combo;
-	_tmp183_ = renderer;
-	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp182_, (GtkCellRenderer*) _tmp183_, TRUE);
-	_tmp184_ = self->priv->paper_size_combo;
-	_tmp185_ = renderer;
-	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp184_, (GtkCellRenderer*) _tmp185_, "text", 2);
-	_tmp186_ = self->priv->settings;
-	_tmp187_ = g_settings_get_int (_tmp186_, "paper-width");
-	paper_width = _tmp187_;
-	_tmp188_ = self->priv->settings;
-	_tmp189_ = g_settings_get_int (_tmp188_, "paper-height");
-	paper_height = _tmp189_;
-	_tmp190_ = paper_width;
-	_tmp191_ = paper_height;
-	user_interface_set_paper_size (self, _tmp190_, _tmp191_);
-	_tmp192_ = self->priv->settings;
-	_tmp193_ = g_settings_get_string (_tmp192_, "selected-device");
-	device = _tmp193_;
-	_tmp194_ = device;
-	if (_tmp194_ != NULL) {
-		const gchar* _tmp195_;
-		GtkTreeIter _tmp196_ = {0};
-		gboolean _tmp197_ = FALSE;
-		_tmp195_ = device;
-		_tmp197_ = user_interface_find_scan_device (self, _tmp195_, &_tmp196_);
-		iter = _tmp196_;
-		if (_tmp197_) {
-			GtkComboBox* _tmp198_;
-			GtkTreeIter _tmp199_;
-			_tmp198_ = self->priv->device_combo;
-			_tmp199_ = iter;
-			gtk_combo_box_set_active_iter (_tmp198_, &_tmp199_);
+#line 1441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	renderer = _tmp201_;
+#line 1442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp202_ = self->priv->paper_size_combo;
+#line 1442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp203_ = renderer;
+#line 1442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp202_, (GtkCellRenderer*) _tmp203_, TRUE);
+#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp204_ = self->priv->paper_size_combo;
+#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp205_ = renderer;
+#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp204_, (GtkCellRenderer*) _tmp205_, "text", 2);
+#line 1444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp206_ = self->priv->settings;
+#line 1444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp207_ = g_settings_get_int (_tmp206_, "paper-width");
+#line 1444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	paper_width = _tmp207_;
+#line 1445 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp208_ = self->priv->settings;
+#line 1445 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp209_ = g_settings_get_int (_tmp208_, "paper-height");
+#line 1445 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	paper_height = _tmp209_;
+#line 1446 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp210_ = paper_width;
+#line 1446 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp211_ = paper_height;
+#line 1446 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_set_paper_size (self, _tmp210_, _tmp211_);
+#line 1448 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp212_ = self->priv->brightness_adjustment;
+#line 1448 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp213_ = gtk_adjustment_get_lower (_tmp212_);
+#line 1448 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	lower = _tmp213_;
+#line 1449 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp214_ = _ ("Darker");
+#line 1449 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp215_ = g_strdup_printf ("<small>%s</small>", _tmp214_);
+#line 1449 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	darker_label = _tmp215_;
+#line 1450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp216_ = self->priv->brightness_adjustment;
+#line 1450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp217_ = gtk_adjustment_get_upper (_tmp216_);
+#line 1450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	upper = _tmp217_;
+#line 1451 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp218_ = _ ("Lighter");
+#line 1451 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp219_ = g_strdup_printf ("<small>%s</small>", _tmp218_);
+#line 1451 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	lighter_label = _tmp219_;
+#line 1452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp220_ = self->priv->brightness_scale;
+#line 1452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp221_ = lower;
+#line 1452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp222_ = darker_label;
+#line 1452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_scale_add_mark (_tmp220_, _tmp221_, GTK_POS_BOTTOM, _tmp222_);
+#line 1453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp223_ = self->priv->brightness_scale;
+#line 1453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_scale_add_mark (_tmp223_, (gdouble) 0, GTK_POS_BOTTOM, NULL);
+#line 1454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp224_ = self->priv->brightness_scale;
+#line 1454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp225_ = upper;
+#line 1454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp226_ = lighter_label;
+#line 1454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_scale_add_mark (_tmp224_, _tmp225_, GTK_POS_BOTTOM, _tmp226_);
+#line 1455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp227_ = self->priv->settings;
+#line 1455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp228_ = g_settings_get_int (_tmp227_, "brightness");
+#line 1455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_set_brightness (self, _tmp228_);
+#line 1457 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp229_ = self->priv->contrast_adjustment;
+#line 1457 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp230_ = gtk_adjustment_get_lower (_tmp229_);
+#line 1457 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	lower = _tmp230_;
+#line 1458 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp231_ = _ ("Less");
+#line 1458 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp232_ = g_strdup_printf ("<small>%s</small>", _tmp231_);
+#line 1458 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	less_label = _tmp232_;
+#line 1459 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp233_ = self->priv->contrast_adjustment;
+#line 1459 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp234_ = gtk_adjustment_get_upper (_tmp233_);
+#line 1459 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	upper = _tmp234_;
+#line 1460 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp235_ = _ ("More");
+#line 1460 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp236_ = g_strdup_printf ("<small>%s</small>", _tmp235_);
+#line 1460 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	more_label = _tmp236_;
+#line 1461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp237_ = self->priv->contrast_scale;
+#line 1461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp238_ = lower;
+#line 1461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp239_ = less_label;
+#line 1461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_scale_add_mark (_tmp237_, _tmp238_, GTK_POS_BOTTOM, _tmp239_);
+#line 1462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp240_ = self->priv->contrast_scale;
+#line 1462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_scale_add_mark (_tmp240_, (gdouble) 0, GTK_POS_BOTTOM, NULL);
+#line 1463 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp241_ = self->priv->contrast_scale;
+#line 1463 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp242_ = upper;
+#line 1463 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp243_ = more_label;
+#line 1463 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_scale_add_mark (_tmp241_, _tmp242_, GTK_POS_BOTTOM, _tmp243_);
+#line 1464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp244_ = self->priv->settings;
+#line 1464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp245_ = g_settings_get_int (_tmp244_, "contrast");
+#line 1464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_set_contrast (self, _tmp245_);
+#line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp246_ = self->priv->quality_adjustment;
+#line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp247_ = gtk_adjustment_get_lower (_tmp246_);
+#line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	lower = _tmp247_;
+#line 1467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp248_ = _ ("Minimum");
+#line 1467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp249_ = g_strdup_printf ("<small>%s</small>", _tmp248_);
+#line 1467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	minimum_label = _tmp249_;
+#line 1468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp250_ = self->priv->quality_adjustment;
+#line 1468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp251_ = gtk_adjustment_get_upper (_tmp250_);
+#line 1468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	upper = _tmp251_;
+#line 1469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp252_ = _ ("Maximum");
+#line 1469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp253_ = g_strdup_printf ("<small>%s</small>", _tmp252_);
+#line 1469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	maximum_label = _tmp253_;
+#line 1470 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp254_ = self->priv->quality_scale;
+#line 1470 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp255_ = lower;
+#line 1470 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp256_ = minimum_label;
+#line 1470 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_scale_add_mark (_tmp254_, _tmp255_, GTK_POS_BOTTOM, _tmp256_);
+#line 1471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp257_ = self->priv->quality_scale;
+#line 1471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_scale_add_mark (_tmp257_, (gdouble) 75, GTK_POS_BOTTOM, NULL);
+#line 1472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp258_ = self->priv->quality_scale;
+#line 1472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp259_ = upper;
+#line 1472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp260_ = maximum_label;
+#line 1472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_scale_add_mark (_tmp258_, _tmp259_, GTK_POS_BOTTOM, _tmp260_);
+#line 1473 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp261_ = self->priv->settings;
+#line 1473 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp262_ = g_settings_get_int (_tmp261_, "jpeg-quality");
+#line 1473 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_set_quality (self, _tmp262_);
+#line 1475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp263_ = self->priv->settings;
+#line 1475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp264_ = g_settings_get_string (_tmp263_, "selected-device");
+#line 1475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	device = _tmp264_;
+#line 1476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp265_ = device;
+#line 1476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp265_ != NULL) {
+#line 7584 "ui.c"
+		const gchar* _tmp266_;
+		GtkTreeIter _tmp267_ = {0};
+		gboolean _tmp268_ = FALSE;
+#line 1478 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp266_ = device;
+#line 1478 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp268_ = user_interface_find_scan_device (self, _tmp266_, &_tmp267_);
+#line 1478 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		iter = _tmp267_;
+#line 1478 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		if (_tmp268_) {
+#line 7596 "ui.c"
+			GtkComboBox* _tmp269_;
+			GtkTreeIter _tmp270_;
+#line 1479 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp269_ = self->priv->device_combo;
+#line 1479 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp270_ = iter;
+#line 1479 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			gtk_combo_box_set_active_iter (_tmp269_, &_tmp270_);
+#line 7605 "ui.c"
 		}
 	}
-	_tmp200_ = self->priv->settings;
-	_tmp201_ = g_settings_get_string (_tmp200_, "document-type");
-	document_type = _tmp201_;
-	_tmp202_ = document_type;
-	if (_tmp202_ != NULL) {
-		const gchar* _tmp203_;
-		_tmp203_ = document_type;
-		user_interface_set_document_hint (self, _tmp203_);
-	}
-	_tmp204_ = self->priv->book;
-	_tmp205_ = book_view_new (_tmp204_);
-	g_object_ref_sink (_tmp205_);
+#line 1482 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp271_ = self->priv->settings;
+#line 1482 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp272_ = g_settings_get_string (_tmp271_, "document-type");
+#line 1482 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	document_type = _tmp272_;
+#line 1483 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp273_ = document_type;
+#line 1483 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp273_ != NULL) {
+#line 7618 "ui.c"
+		const gchar* _tmp274_;
+#line 1484 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp274_ = document_type;
+#line 1484 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		user_interface_set_document_hint (self, _tmp274_);
+#line 7624 "ui.c"
+	}
+#line 1486 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp275_ = self->priv->book;
+#line 1486 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp276_ = book_view_new (_tmp275_);
+#line 1486 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp276_);
+#line 1486 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->book_view);
-	self->priv->book_view = _tmp205_;
-	_tmp206_ = self->priv->book_view;
-	gtk_container_set_border_width ((GtkContainer*) _tmp206_, (guint) 18);
-	_tmp207_ = self->priv->main_vbox;
-	_tmp208_ = self->priv->book_view;
-	gtk_box_pack_end ((GtkBox*) _tmp207_, (GtkWidget*) _tmp208_, TRUE, TRUE, (guint) 0);
-	_tmp209_ = self->priv->book_view;
-	g_signal_connect (_tmp209_, "page-selected", (GCallback) _user_interface_page_selected_cb_book_view_page_selected, self);
-	_tmp210_ = self->priv->book_view;
-	g_signal_connect (_tmp210_, "show-page", (GCallback) _user_interface_show_page_cb_book_view_show_page, self);
-	_tmp211_ = self->priv->book_view;
-	g_signal_connect (_tmp211_, "show-menu", (GCallback) _user_interface_show_page_menu_cb_book_view_show_menu, self);
-	_tmp212_ = self->priv->book_view;
-	gtk_widget_show ((GtkWidget*) _tmp212_);
-	_tmp213_ = self->priv->settings;
-	_tmp214_ = g_settings_get_enum (_tmp213_, "scan-direction");
-	self->priv->default_page_scan_direction = (ScanDirection) _tmp214_;
-	_tmp215_ = self->priv->settings;
-	_tmp216_ = g_settings_get_int (_tmp215_, "page-width");
-	self->priv->default_page_width = _tmp216_;
-	_tmp217_ = self->priv->default_page_width;
-	if (_tmp217_ <= 0) {
+#line 1486 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->book_view = _tmp276_;
+#line 1487 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp277_ = self->priv->book_view;
+#line 1487 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_container_set_border_width ((GtkContainer*) _tmp277_, (guint) 18);
+#line 1488 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp278_ = self->priv->main_vbox;
+#line 1488 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp279_ = self->priv->book_view;
+#line 1488 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_box_pack_end ((GtkBox*) _tmp278_, (GtkWidget*) _tmp279_, TRUE, TRUE, (guint) 0);
+#line 1489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp280_ = self->priv->book_view;
+#line 1489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect (_tmp280_, "page-selected", (GCallback) _user_interface_page_selected_cb_book_view_page_selected, self);
+#line 1490 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp281_ = self->priv->book_view;
+#line 1490 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect (_tmp281_, "show-page", (GCallback) _user_interface_show_page_cb_book_view_show_page, self);
+#line 1491 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp282_ = self->priv->book_view;
+#line 1491 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect (_tmp282_, "show-menu", (GCallback) _user_interface_show_page_menu_cb_book_view_show_menu, self);
+#line 1492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp283_ = self->priv->book_view;
+#line 1492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_show ((GtkWidget*) _tmp283_);
+#line 1495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp284_ = self->priv->settings;
+#line 1495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp285_ = g_settings_get_enum (_tmp284_, "scan-direction");
+#line 1495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->default_page_scan_direction = (ScanDirection) _tmp285_;
+#line 1496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp286_ = self->priv->settings;
+#line 1496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp287_ = g_settings_get_int (_tmp286_, "page-width");
+#line 1496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->default_page_width = _tmp287_;
+#line 1497 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp288_ = self->priv->default_page_width;
+#line 1497 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp288_ <= 0) {
+#line 1498 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->default_page_width = 595;
-	}
-	_tmp218_ = self->priv->settings;
-	_tmp219_ = g_settings_get_int (_tmp218_, "page-height");
-	self->priv->default_page_height = _tmp219_;
-	_tmp220_ = self->priv->default_page_height;
-	if (_tmp220_ <= 0) {
+#line 7680 "ui.c"
+	}
+#line 1499 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp289_ = self->priv->settings;
+#line 1499 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp290_ = g_settings_get_int (_tmp289_, "page-height");
+#line 1499 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->default_page_height = _tmp290_;
+#line 1500 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp291_ = self->priv->default_page_height;
+#line 1500 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp291_ <= 0) {
+#line 1501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->default_page_height = 842;
-	}
-	_tmp221_ = self->priv->settings;
-	_tmp222_ = g_settings_get_int (_tmp221_, "page-dpi");
-	self->priv->default_page_dpi = _tmp222_;
-	_tmp223_ = self->priv->default_page_dpi;
-	if (_tmp223_ <= 0) {
+#line 7694 "ui.c"
+	}
+#line 1502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp292_ = self->priv->settings;
+#line 1502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp293_ = g_settings_get_int (_tmp292_, "page-dpi");
+#line 1502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->default_page_dpi = _tmp293_;
+#line 1503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp294_ = self->priv->default_page_dpi;
+#line 1503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp294_ <= 0) {
+#line 1504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->default_page_dpi = 72;
-	}
-	_tmp224_ = self->priv->settings;
-	_tmp225_ = g_settings_get_int (_tmp224_, "window-width");
-	self->priv->window_width = _tmp225_;
-	_tmp226_ = self->priv->window_width;
-	if (_tmp226_ <= 0) {
+#line 7708 "ui.c"
+	}
+#line 1507 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp295_ = self->priv->settings;
+#line 1507 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp296_ = g_settings_get_int (_tmp295_, "window-width");
+#line 1507 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->window_width = _tmp296_;
+#line 1508 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp297_ = self->priv->window_width;
+#line 1508 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp297_ <= 0) {
+#line 1509 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->window_width = 600;
-	}
-	_tmp227_ = self->priv->settings;
-	_tmp228_ = g_settings_get_int (_tmp227_, "window-height");
-	self->priv->window_height = _tmp228_;
-	_tmp229_ = self->priv->window_height;
-	if (_tmp229_ <= 0) {
+#line 7722 "ui.c"
+	}
+#line 1510 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp298_ = self->priv->settings;
+#line 1510 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp299_ = g_settings_get_int (_tmp298_, "window-height");
+#line 1510 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->window_height = _tmp299_;
+#line 1511 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp300_ = self->priv->window_height;
+#line 1511 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp300_ <= 0) {
+#line 1512 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->window_height = 400;
-	}
-	_tmp230_ = self->priv->window_width;
-	_tmp231_ = self->priv->window_height;
-	g_debug ("ui.vala:1404: Restoring window to %dx%d pixels", _tmp230_, _tmp231_);
-	_tmp232_ = self->priv->window;
-	_tmp233_ = self->priv->window_width;
-	_tmp234_ = self->priv->window_height;
-	gtk_window_set_default_size (_tmp232_, _tmp233_, _tmp234_);
-	_tmp235_ = self->priv->settings;
-	_tmp236_ = g_settings_get_boolean (_tmp235_, "window-is-maximized");
-	self->priv->window_is_maximized = _tmp236_;
-	_tmp237_ = self->priv->window_is_maximized;
-	if (_tmp237_) {
-		GtkWindow* _tmp238_;
-		g_debug ("ui.vala:1409: Restoring window to maximized");
-		_tmp238_ = self->priv->window;
-		gtk_window_maximize (_tmp238_);
-	}
-	_tmp239_ = self->priv->book;
-	_tmp240_ = book_get_n_pages (_tmp239_);
-	if (_tmp240_ == ((guint) 0)) {
+#line 7736 "ui.c"
+	}
+#line 1513 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp301_ = self->priv->window_width;
+#line 1513 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp302_ = self->priv->window_height;
+#line 1513 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_debug ("ui.vala:1513: Restoring window to %dx%d pixels", _tmp301_, _tmp302_);
+#line 1514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp303_ = self->priv->window;
+#line 1514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp304_ = self->priv->window_width;
+#line 1514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp305_ = self->priv->window_height;
+#line 1514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_window_set_default_size (_tmp303_, _tmp304_, _tmp305_);
+#line 1515 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp306_ = self->priv->settings;
+#line 1515 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp307_ = g_settings_get_boolean (_tmp306_, "window-is-maximized");
+#line 1515 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->window_is_maximized = _tmp307_;
+#line 1516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp308_ = self->priv->window_is_maximized;
+#line 1516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp308_) {
+#line 7762 "ui.c"
+		GtkWindow* _tmp309_;
+#line 1518 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_debug ("ui.vala:1518: Restoring window to maximized");
+#line 1519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp309_ = self->priv->window;
+#line 1519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_window_maximize (_tmp309_);
+#line 7770 "ui.c"
+	}
+#line 1522 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp310_ = self->priv->book;
+#line 1522 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp311_ = book_get_n_pages (_tmp310_);
+#line 1522 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp311_ == ((guint) 0)) {
+#line 1523 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_add_default_page (self);
-	}
-	_tmp241_ = self->priv->book;
-	book_set_needs_saving (_tmp241_, FALSE);
-	_tmp242_ = self->priv->book;
-	g_signal_connect (_tmp242_, "needs-saving-changed", (GCallback) _user_interface_needs_saving_cb_book_needs_saving_changed, self);
-	_tmp243_ = self->priv->window;
-	_tmp244_ = _ ("Saving document...");
-	_tmp245_ = progress_bar_dialog_new (_tmp243_, _tmp244_);
-	g_object_ref_sink (_tmp245_);
+#line 7780 "ui.c"
+	}
+#line 1524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp312_ = self->priv->book;
+#line 1524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	book_set_needs_saving (_tmp312_, FALSE);
+#line 1525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp313_ = self->priv->book;
+#line 1525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect (_tmp313_, "needs-saving-changed", (GCallback) _user_interface_needs_saving_cb_book_needs_saving_changed, self);
+#line 1527 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp314_ = self->priv->window;
+#line 1527 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp315_ = _ ("Saving document...");
+#line 1527 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp316_ = progress_bar_dialog_new (_tmp314_, _tmp315_);
+#line 1527 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp316_);
+#line 1527 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->progress_dialog);
-	self->priv->progress_dialog = _tmp245_;
-	_tmp246_ = self->priv->book;
-	g_signal_connect (_tmp246_, "saving", (GCallback) _user_interface_book_saving_cb_book_saving, self);
+#line 1527 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->progress_dialog = _tmp316_;
+#line 1528 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp317_ = self->priv->book;
+#line 1528 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect (_tmp317_, "saving", (GCallback) _user_interface_book_saving_cb_book_saving, self);
+#line 1318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (document_type);
+#line 1318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (device);
+#line 1318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_free0 (maximum_label);
+#line 1318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_free0 (minimum_label);
+#line 1318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_free0 (more_label);
+#line 1318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_free0 (less_label);
+#line 1318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_free0 (lighter_label);
+#line 1318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_free0 (darker_label);
+#line 1318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (renderer);
+#line 1318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (content_area);
+#line 1318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (hbox);
+#line 1318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (app);
-	_g_free0 (filename);
+#line 7830 "ui.c"
 }
 
 
-static gboolean ___lambda2_ (UserInterface* self) {
+static gboolean ___lambda3_ (UserInterface* self) {
 	gboolean result = FALSE;
 	ProgressBarDialog* _tmp0_;
+#line 1542 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->progress_dialog;
+#line 1542 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_hide ((GtkWidget*) _tmp0_);
+#line 1543 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
+#line 1543 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
+#line 7845 "ui.c"
 }
 
 
-static gboolean ____lambda2__gsource_func (gpointer self) {
+static gboolean ____lambda3__gsource_func (gpointer self) {
 	gboolean result;
-	result = ___lambda2_ (self);
+	result = ___lambda3_ (self);
+#line 1541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
+#line 7854 "ui.c"
 }
 
 
@@ -4512,59 +7883,102 @@ static void user_interface_book_saving_cb (UserInterface* self, gint page_number
 	ProgressBarDialog* _tmp11_;
 	gdouble _tmp12_;
 	ProgressBarDialog* _tmp13_;
+#line 1531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 1534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	while (TRUE) {
+#line 7880 "ui.c"
 		gboolean _tmp0_ = FALSE;
+#line 1534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = gtk_events_pending ();
+#line 1534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (!_tmp0_) {
+#line 1534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
+#line 7888 "ui.c"
 		}
+#line 1535 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_main_iteration ();
+#line 7892 "ui.c"
 	}
+#line 1537 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->book;
+#line 1537 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = book_get_n_pages (_tmp1_);
+#line 1537 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	total = (gint) _tmp2_;
+#line 1538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = page_number;
+#line 1538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = total;
+#line 1538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	fraction = (_tmp3_ + 1.0) / _tmp4_;
+#line 1539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = fraction;
+#line 1539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	complete = _tmp5_ == 1.0;
+#line 1540 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = complete;
+#line 1540 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp6_) {
-		g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 500, ____lambda2__gsource_func, user_interface_ref (self), user_interface_unref);
+#line 1541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 500, ____lambda3__gsource_func, user_interface_ref (self), user_interface_unref);
+#line 7916 "ui.c"
 	}
+#line 1545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = _ ("Saving page %d out of %d");
+#line 1545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = page_number;
+#line 1545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = total;
+#line 1545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = g_strdup_printf (_tmp7_, _tmp8_ + 1, _tmp9_);
+#line 1545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	message = _tmp10_;
+#line 1547 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = self->priv->progress_dialog;
+#line 1547 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = fraction;
+#line 1547 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	progress_bar_dialog_set_fraction (_tmp11_, _tmp12_);
+#line 1548 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = self->priv->progress_dialog;
+#line 1548 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	progress_bar_dialog_set_message (_tmp13_, message);
+#line 1531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (message);
+#line 7940 "ui.c"
 }
 
 
 void user_interface_show_progress_dialog (UserInterface* self) {
 	ProgressBarDialog* _tmp0_;
+#line 1551 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 1553 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->progress_dialog;
+#line 1553 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_show ((GtkWidget*) _tmp0_);
+#line 7952 "ui.c"
 }
 
 
 void user_interface_hide_progress_dialog (UserInterface* self) {
 	ProgressBarDialog* _tmp0_;
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 1558 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->progress_dialog;
+#line 1558 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_hide ((GtkWidget*) _tmp0_);
+#line 7964 "ui.c"
 }
 
 
 static gpointer _book_ref0 (gpointer self) {
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self ? book_ref (self) : NULL;
+#line 7971 "ui.c"
 }
 
 
@@ -4572,22 +7986,34 @@ Book* user_interface_get_book (UserInterface* self) {
 	Book* result = NULL;
 	Book* _tmp0_;
 	Book* _tmp1_;
+#line 1561 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book;
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _book_ref0 (_tmp0_);
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = _tmp1_;
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
+#line 7989 "ui.c"
 }
 
 
 void user_interface_set_selected_page (UserInterface* self, Page* page) {
 	BookView* _tmp0_;
 	Page* _tmp1_;
+#line 1566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 1566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = page;
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_view_select_page (_tmp0_, _tmp1_);
+#line 8006 "ui.c"
 }
 
 
@@ -4595,11 +8021,17 @@ Page* user_interface_get_selected_page (UserInterface* self) {
 	Page* result = NULL;
 	BookView* _tmp0_;
 	Page* _tmp1_ = NULL;
+#line 1571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
+#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
+#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_selected (_tmp0_);
+#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = _tmp1_;
+#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
+#line 8024 "ui.c"
 }
 
 
@@ -4611,18 +8043,31 @@ void user_interface_set_scanning (UserInterface* self, gboolean scanning) {
 	gboolean _tmp4_;
 	GtkToolButton* _tmp5_;
 	gboolean _tmp6_;
+#line 1576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 1578 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = scanning;
+#line 1578 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->scanning = _tmp0_;
+#line 1579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->page_delete_menuitem;
+#line 1579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = scanning;
+#line 1579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp1_, !_tmp2_);
+#line 1580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->stop_menuitem;
+#line 1580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = scanning;
+#line 1580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp3_, _tmp4_);
+#line 1581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = self->priv->stop_toolbutton;
+#line 1581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = scanning;
+#line 1581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp5_, _tmp6_);
+#line 8060 "ui.c"
 }
 
 
@@ -4632,29 +8077,49 @@ void user_interface_show_error (UserInterface* self, const gchar* error_title, c
 	const gchar* _tmp2_;
 	gchar* _tmp3_;
 	gboolean _tmp4_;
+#line 1584 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 1584 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (error_title != NULL);
+#line 1584 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (error_text != NULL);
+#line 1586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->have_error = TRUE;
+#line 1587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = error_title;
+#line 1587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_strdup (_tmp0_);
+#line 1587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->error_title);
+#line 1587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->error_title = _tmp1_;
+#line 1588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = error_text;
+#line 1588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = g_strdup (_tmp2_);
+#line 1588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->error_text);
+#line 1588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->error_text = _tmp3_;
+#line 1589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = change_scanner_hint;
+#line 1589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->error_change_scanner_hint = _tmp4_;
+#line 1590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_info_bar (self);
+#line 8100 "ui.c"
 }
 
 
 void user_interface_start (UserInterface* self) {
 	GtkWindow* _tmp0_;
+#line 1593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 1595 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->window;
+#line 1595 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_show ((GtkWidget*) _tmp0_);
+#line 8112 "ui.c"
 }
 
 
@@ -4665,136 +8130,255 @@ static void g_cclosure_user_marshal_VOID__STRING_SCAN_OPTIONS (GClosure * closur
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (n_param_values == 3);
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		data1 = closure->data;
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		data2 = param_values->data[0].v_pointer;
+#line 8131 "ui.c"
 	} else {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		data1 = param_values->data[0].v_pointer;
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		data2 = closure->data;
+#line 8137 "ui.c"
 	}
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	callback = (GMarshalFunc_VOID__STRING_SCAN_OPTIONS) (marshal_data ? marshal_data : cc->callback);
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	callback (data1, g_value_get_string (param_values + 1), value_get_scan_options (param_values + 2), data2);
+#line 8143 "ui.c"
+}
+
+
+static void g_cclosure_user_marshal_VOID__STRING_INT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
+	typedef void (*GMarshalFunc_VOID__STRING_INT) (gpointer data1, const char* arg_1, gint arg_2, gpointer data2);
+	register GMarshalFunc_VOID__STRING_INT callback;
+	register GCClosure * cc;
+	register gpointer data1;
+	register gpointer data2;
+	cc = (GCClosure *) closure;
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (n_param_values == 3);
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (G_CCLOSURE_SWAP_DATA (closure)) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		data1 = closure->data;
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		data2 = param_values->data[0].v_pointer;
+#line 8162 "ui.c"
+	} else {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		data1 = param_values->data[0].v_pointer;
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		data2 = closure->data;
+#line 8168 "ui.c"
+	}
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	callback = (GMarshalFunc_VOID__STRING_INT) (marshal_data ? marshal_data : cc->callback);
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	callback (data1, g_value_get_string (param_values + 1), g_value_get_int (param_values + 2), data2);
+#line 8174 "ui.c"
 }
 
 
 static void value_user_interface_init (GValue* value) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	value->data[0].v_pointer = NULL;
+#line 8181 "ui.c"
 }
 
 
 static void value_user_interface_free_value (GValue* value) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (value->data[0].v_pointer) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_unref (value->data[0].v_pointer);
+#line 8190 "ui.c"
 	}
 }
 
 
 static void value_user_interface_copy_value (const GValue* src_value, GValue* dest_value) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (src_value->data[0].v_pointer) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		dest_value->data[0].v_pointer = user_interface_ref (src_value->data[0].v_pointer);
+#line 8200 "ui.c"
 	} else {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		dest_value->data[0].v_pointer = NULL;
+#line 8204 "ui.c"
 	}
 }
 
 
 static gpointer value_user_interface_peek_pointer (const GValue* value) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return value->data[0].v_pointer;
+#line 8212 "ui.c"
 }
 
 
 static gchar* value_user_interface_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (collect_values[0].v_pointer) {
+#line 8219 "ui.c"
 		UserInterface* object;
 		object = collect_values[0].v_pointer;
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (object->parent_instance.g_class == NULL) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+#line 8226 "ui.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+#line 8230 "ui.c"
 		}
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		value->data[0].v_pointer = user_interface_ref (object);
+#line 8234 "ui.c"
 	} else {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		value->data[0].v_pointer = NULL;
+#line 8238 "ui.c"
 	}
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return NULL;
+#line 8242 "ui.c"
 }
 
 
 static gchar* value_user_interface_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	UserInterface** object_p;
 	object_p = collect_values[0].v_pointer;
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!object_p) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
+#line 8253 "ui.c"
 	}
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!value->data[0].v_pointer) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*object_p = NULL;
+#line 8259 "ui.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*object_p = value->data[0].v_pointer;
+#line 8263 "ui.c"
 	} else {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*object_p = user_interface_ref (value->data[0].v_pointer);
+#line 8267 "ui.c"
 	}
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return NULL;
+#line 8271 "ui.c"
 }
 
 
 GParamSpec* param_spec_user_interface (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecUserInterface* spec;
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_USER_INTERFACE), NULL);
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return G_PARAM_SPEC (spec);
+#line 8285 "ui.c"
 }
 
 
 gpointer value_get_user_interface (const GValue* value) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_USER_INTERFACE), NULL);
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return value->data[0].v_pointer;
+#line 8294 "ui.c"
 }
 
 
 void value_set_user_interface (GValue* value, gpointer v_object) {
 	UserInterface* old;
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_USER_INTERFACE));
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	old = value->data[0].v_pointer;
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (v_object) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_USER_INTERFACE));
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		value->data[0].v_pointer = v_object;
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_ref (value->data[0].v_pointer);
+#line 8314 "ui.c"
 	} else {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		value->data[0].v_pointer = NULL;
+#line 8318 "ui.c"
 	}
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (old) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_unref (old);
+#line 8324 "ui.c"
 	}
 }
 
 
 void value_take_user_interface (GValue* value, gpointer v_object) {
 	UserInterface* old;
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_USER_INTERFACE));
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	old = value->data[0].v_pointer;
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (v_object) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_USER_INTERFACE));
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		value->data[0].v_pointer = v_object;
+#line 8343 "ui.c"
 	} else {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		value->data[0].v_pointer = NULL;
+#line 8347 "ui.c"
 	}
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (old) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_unref (old);
+#line 8353 "ui.c"
 	}
 }
 
 
 static void user_interface_class_init (UserInterfaceClass * klass) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_parent_class = g_type_class_peek_parent (klass);
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	USER_INTERFACE_CLASS (klass)->finalize = user_interface_finalize;
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_type_class_add_private (klass, sizeof (UserInterfacePrivate));
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_new ("start_scan", TYPE_USER_INTERFACE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_SCAN_OPTIONS, G_TYPE_NONE, 2, G_TYPE_STRING, TYPE_SCAN_OPTIONS);
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_new ("stop_scan", TYPE_USER_INTERFACE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-	g_signal_new ("email", TYPE_USER_INTERFACE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_new ("email", TYPE_USER_INTERFACE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_INT, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_INT);
+#line 8371 "ui.c"
 }
 
 
@@ -4802,15 +8386,25 @@ static void user_interface_instance_init (UserInterface * self) {
 	gchar* _tmp0_;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_;
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv = USER_INTERFACE_GET_PRIVATE (self);
+#line 78 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->book_uri = NULL;
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = g_strdup ("photo");
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->document_hint = _tmp0_;
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _ ("Scanned Document.pdf");
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = g_strdup (_tmp1_);
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_file_name = _tmp2_;
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->scanning = FALSE;
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->ref_count = 1;
+#line 8397 "ui.c"
 }
 
 
@@ -4820,59 +8414,129 @@ static void user_interface_finalize (UserInterface* obj) {
 	guint _tmp1_ = 0U;
 	Book* _tmp2_;
 	guint _tmp3_ = 0U;
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_USER_INTERFACE, UserInterface);
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book;
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_parse_name ("page-removed", TYPE_BOOK, &_tmp1_, NULL, FALSE);
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _user_interface_page_removed_cb_book_page_removed, self);
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = self->priv->book;
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_parse_name ("page-added", TYPE_BOOK, &_tmp3_, NULL, FALSE);
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _user_interface_page_added_cb_book_page_added, self);
+#line 17 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->settings);
+#line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->builder);
+#line 21 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->window);
+#line 22 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->main_vbox);
+#line 23 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar);
+#line 24 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_image);
+#line 25 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_label);
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_close_button);
+#line 27 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_change_scanner_button);
+#line 28 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->page_move_left_menuitem);
+#line 29 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->page_move_right_menuitem);
+#line 30 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->page_delete_menuitem);
+#line 31 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->crop_rotate_menuitem);
+#line 32 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->save_menuitem);
+#line 33 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->save_as_menuitem);
+#line 34 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->copy_to_clipboard_menuitem);
+#line 35 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->save_toolbutton);
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->stop_menuitem);
+#line 37 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->stop_toolbutton);
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->text_toolbar_menuitem);
+#line 40 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->text_menu_menuitem);
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->photo_toolbar_menuitem);
+#line 42 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->photo_menu_menuitem);
+#line 44 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->authorize_dialog);
+#line 45 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->authorize_label);
+#line 46 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->username_entry);
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->password_entry);
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->preferences_dialog);
+#line 50 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->device_combo);
+#line 51 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->text_dpi_combo);
+#line 52 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->photo_dpi_combo);
+#line 53 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->page_side_combo);
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->paper_size_combo);
+#line 55 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->brightness_scale);
+#line 56 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->contrast_scale);
+#line 57 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->quality_scale);
+#line 58 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->device_model);
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->text_dpi_model);
+#line 60 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->photo_dpi_model);
+#line 61 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->page_side_model);
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->paper_size_model);
+#line 63 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->brightness_adjustment);
+#line 64 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->contrast_adjustment);
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->quality_adjustment);
+#line 69 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->save_dialog);
+#line 70 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->progress_dialog);
+#line 73 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->error_title);
+#line 74 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->error_text);
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_book_unref0 (self->priv->book);
+#line 78 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->book_uri);
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_autosave_manager_unref0 (self->priv->autosave_manager);
+#line 82 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->book_view);
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->document_hint);
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->default_file_name);
+#line 8529 "ui.c"
 }
 
 
@@ -4893,17 +8557,24 @@ GType user_interface_get_type (void) {
 gpointer user_interface_ref (gpointer instance) {
 	UserInterface* self;
 	self = instance;
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_atomic_int_inc (&self->ref_count);
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return instance;
+#line 8554 "ui.c"
 }
 
 
 void user_interface_unref (gpointer instance) {
 	UserInterface* self;
 	self = instance;
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		USER_INTERFACE_GET_CLASS (self)->finalize (self);
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_type_free_instance ((GTypeInstance *) self);
+#line 8567 "ui.c"
 	}
 }
 
@@ -4922,91 +8593,154 @@ ProgressBarDialog* progress_bar_dialog_construct (GType object_type, GtkWindow*
 	const gchar* _tmp7_;
 	GtkWindow* _tmp8_;
 	GtkProgressBar* _tmp9_;
+#line 1603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (parent != NULL, NULL);
+#line 1603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (title != NULL, NULL);
+#line 1603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (ProgressBarDialog*) g_object_new (object_type, NULL);
+#line 1605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = (GtkProgressBar*) gtk_progress_bar_new ();
+#line 1605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp0_);
+#line 1605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->bar);
+#line 1605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->bar = _tmp0_;
+#line 1606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
+#line 1606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp1_);
+#line 1606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	hbox = _tmp1_;
+#line 1607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
+#line 1607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp2_);
+#line 1607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	vbox = _tmp2_;
+#line 1608 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_hexpand ((GtkWidget*) hbox, TRUE);
+#line 1610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->bar;
+#line 1610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_progress_bar_set_text (_tmp3_, "");
+#line 1611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->bar;
+#line 1611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_progress_bar_set_show_text (_tmp4_, TRUE);
+#line 1612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = self->priv->bar;
+#line 1612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_size_request ((GtkWidget*) _tmp5_, 225, 25);
+#line 1613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_size_request ((GtkWidget*) self, 250, 50);
+#line 1615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = self->priv->bar;
+#line 1615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (vbox, (GtkWidget*) _tmp6_, TRUE, FALSE, (guint) 0);
+#line 1616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (hbox, (GtkWidget*) vbox, TRUE, FALSE, (guint) 0);
+#line 1617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_add ((GtkContainer*) self, (GtkWidget*) hbox);
+#line 1618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = title;
+#line 1618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_title ((GtkWindow*) self, _tmp7_);
+#line 1620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = parent;
+#line 1620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_transient_for ((GtkWindow*) self, _tmp8_);
+#line 1621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_position ((GtkWindow*) self, GTK_WIN_POS_CENTER_ON_PARENT);
+#line 1622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_modal ((GtkWindow*) self, TRUE);
+#line 1623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_resizable ((GtkWindow*) self, FALSE);
+#line 1625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_show ((GtkWidget*) hbox);
+#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_show ((GtkWidget*) vbox);
+#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = self->priv->bar;
+#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_show ((GtkWidget*) _tmp9_);
+#line 1603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (vbox);
+#line 1603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (hbox);
+#line 1603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self;
+#line 8664 "ui.c"
 }
 
 
 ProgressBarDialog* progress_bar_dialog_new (GtkWindow* parent, const gchar* title) {
+#line 1603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return progress_bar_dialog_construct (TYPE_PROGRESS_BAR_DIALOG, parent, title);
+#line 8671 "ui.c"
 }
 
 
 void progress_bar_dialog_set_fraction (ProgressBarDialog* self, gdouble percent) {
 	GtkProgressBar* _tmp0_;
 	gdouble _tmp1_;
+#line 1630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 1632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->bar;
+#line 1632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = percent;
+#line 1632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_progress_bar_set_fraction (_tmp0_, _tmp1_);
+#line 8686 "ui.c"
 }
 
 
 void progress_bar_dialog_set_message (ProgressBarDialog* self, const gchar* message) {
 	GtkProgressBar* _tmp0_;
 	const gchar* _tmp1_;
+#line 1635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
+#line 1635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (message != NULL);
+#line 1637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->bar;
+#line 1637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = message;
+#line 1637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_progress_bar_set_text (_tmp0_, _tmp1_);
+#line 8703 "ui.c"
 }
 
 
 static void progress_bar_dialog_class_init (ProgressBarDialogClass * klass) {
+#line 1599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	progress_bar_dialog_parent_class = g_type_class_peek_parent (klass);
+#line 1599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_type_class_add_private (klass, sizeof (ProgressBarDialogPrivate));
+#line 1599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (klass)->finalize = progress_bar_dialog_finalize;
+#line 8714 "ui.c"
 }
 
 
 static void progress_bar_dialog_instance_init (ProgressBarDialog * self) {
+#line 1599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv = PROGRESS_BAR_DIALOG_GET_PRIVATE (self);
+#line 8721 "ui.c"
 }
 
 
 static void progress_bar_dialog_finalize (GObject* obj) {
 	ProgressBarDialog * self;
+#line 1599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PROGRESS_BAR_DIALOG, ProgressBarDialog);
+#line 1601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->bar);
+#line 1599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (progress_bar_dialog_parent_class)->finalize (obj);
+#line 8733 "ui.c"
 }
 
 
@@ -5030,57 +8764,96 @@ gchar* get_temporary_filename (const gchar* prefix, const gchar* extension) {
 	gchar* filename;
 	gchar* path = NULL;
 	GError * _inner_error_ = NULL;
+#line 1642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (prefix != NULL, NULL);
+#line 1642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (extension != NULL, NULL);
+#line 1647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = prefix;
+#line 1647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = extension;
+#line 1647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = g_strdup_printf ("%sXXXXXX.%s", _tmp0_, _tmp1_);
+#line 1647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	filename = _tmp2_;
+#line 8769 "ui.c"
 	{
 		const gchar* _tmp3_;
 		gchar* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
 		gint fd;
 		gint _tmp6_;
+#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = filename;
+#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = g_file_open_tmp (_tmp3_, &_tmp4_, &_inner_error_);
+#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
+#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		path = _tmp4_;
+#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		fd = _tmp5_;
+#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_inner_error_ != NULL) {
-			goto __catch21_g_error;
+#line 8788 "ui.c"
+			goto __catch22_g_error;
 		}
+#line 1652 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = fd;
+#line 1652 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		close (_tmp6_);
+#line 8795 "ui.c"
 	}
-	goto __finally21;
-	__catch21_g_error:
+	goto __finally22;
+	__catch22_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp7_;
 		const gchar* _tmp8_;
+#line 1649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
+#line 1649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
+#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = e;
+#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = _tmp7_->message;
-		g_warning ("ui.vala:1547: Error saving email attachment: %s", _tmp8_);
+#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_warning ("ui.vala:1656: Error saving email attachment: %s", _tmp8_);
+#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = NULL;
+#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
+#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
+#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (filename);
+#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
+#line 8823 "ui.c"
 	}
-	__finally21:
+	__finally22:
+#line 1649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_inner_error_ != NULL) {
+#line 1649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
+#line 1649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (filename);
+#line 1649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 1649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
+#line 1649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return NULL;
+#line 8838 "ui.c"
 	}
+#line 1660 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = path;
+#line 1660 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (filename);
+#line 1660 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
+#line 8846 "ui.c"
 }
 
 
diff --git a/src/ui.vala b/src/ui.vala
index 5b192d9..075c97d 100644
--- a/src/ui.vala
+++ b/src/ui.vala
@@ -31,6 +31,7 @@ public class UserInterface
     private Gtk.MenuItem crop_rotate_menuitem;
     private Gtk.MenuItem save_menuitem;
     private Gtk.MenuItem save_as_menuitem;
+    private Gtk.MenuItem copy_to_clipboard_menuitem;
     private Gtk.ToolButton save_toolbutton;
     private Gtk.MenuItem stop_menuitem;
     private Gtk.ToolButton stop_toolbutton;
@@ -51,11 +52,17 @@ public class UserInterface
     private Gtk.ComboBox photo_dpi_combo;
     private Gtk.ComboBox page_side_combo;
     private Gtk.ComboBox paper_size_combo;
+    private Gtk.Scale brightness_scale;
+    private Gtk.Scale contrast_scale;
+    private Gtk.Scale quality_scale;
     private Gtk.ListStore device_model;
     private Gtk.ListStore text_dpi_model;
     private Gtk.ListStore photo_dpi_model;
     private Gtk.ListStore page_side_model;
     private Gtk.ListStore paper_size_model;
+    private Gtk.Adjustment brightness_adjustment;
+    private Gtk.Adjustment contrast_adjustment;
+    private Gtk.Adjustment quality_adjustment;
     private bool setting_devices;
     private bool user_selected_device;
 
@@ -70,6 +77,8 @@ public class UserInterface
     private Book book;
     private string? book_uri = null;
 
+    private AutosaveManager? autosave_manager;
+
     private BookView book_view;
     private bool updating_page_menu;
     private int default_page_width;
@@ -88,17 +97,19 @@ public class UserInterface
 
     public signal void start_scan (string? device, ScanOptions options);
     public signal void stop_scan ();
-    public signal void email (string profile);
+    public signal void email (string profile, int quality);
 
     public UserInterface ()
     {
+        settings = new Settings ("org.gnome.SimpleScan");
+
         book = new Book ();
         book.page_removed.connect (page_removed_cb);
         book.page_added.connect (page_added_cb);
 
-        settings = new Settings ("org.gnome.SimpleScan");
-
         load ();
+
+        autosave_manager = AutosaveManager.create (ref book);
     }
 
     ~UserInterface ()
@@ -316,13 +327,7 @@ public class UserInterface
 
     private void on_file_type_changed (Gtk.TreeSelection selection)
     {
-        Gtk.TreeModel model;
-        Gtk.TreeIter iter;
-        if (!selection.get_selected (out model, out iter))
-            return;
-
-        string extension;
-        model.get (iter, 1, out extension, -1);
+        var extension = get_selected_extension (selection);
         var path = save_dialog.get_filename ();
         var filename = Path.get_basename (path);
 
@@ -334,6 +339,17 @@ public class UserInterface
         save_dialog.set_current_name (filename);
     }
 
+    private string get_selected_extension (Gtk.TreeSelection selection)
+    {
+        Gtk.TreeModel model;
+        Gtk.TreeIter iter;
+        string extension = "";
+
+        if (selection.get_selected (out model, out iter))
+            model.get (iter, 1, out extension, -1);
+        return extension;
+    }
+
     private string choose_file_location ()
     {
         /* Get directory to save to */
@@ -373,10 +389,10 @@ public class UserInterface
         expander.set_spacing (5);
         save_dialog.set_extra_widget (expander);
 
-        string extension = "";
+        string default_extension = "";
         var index = default_file_name.last_index_of_char ('.');
         if (index >= 0)
-            extension = default_file_name.slice (0, index);
+            default_extension = default_file_name.substring (index);
 
         var file_type_store = new Gtk.ListStore (2, typeof (string), typeof (string));
         Gtk.TreeIter iter;
@@ -414,7 +430,7 @@ public class UserInterface
             {
                 string e;
                 file_type_store.get (iter, 1, out e, -1);
-                if (extension == e)
+                if (default_extension == e)
                     file_type_view.get_selection ().select_iter (iter);
             } while (file_type_store.iter_next (ref iter));
         }
@@ -426,7 +442,19 @@ public class UserInterface
 
         string? uri = null;
         if (response == Gtk.ResponseType.ACCEPT)
-            uri = save_dialog.get_uri ();
+        {
+            var selection = file_type_view.get_selection ();
+            var extension = get_selected_extension (selection);
+
+            var path = save_dialog.get_filename ();
+            var filename = Path.get_basename (path);
+            
+            var extension_index = filename.last_index_of_char ('.');
+            if (extension_index < 0)
+                path += extension;
+
+            uri = File.new_for_path (path).get_uri ();
+        }
 
         settings.set_string ("save-directory", save_dialog.get_current_folder ());
 
@@ -465,7 +493,7 @@ public class UserInterface
         show_progress_dialog ();
         try
         {
-            book.save (format, file);
+            book.save (format, get_quality (), file);
         }
         catch (Error e)
         {
@@ -525,6 +553,7 @@ public class UserInterface
         book_uri = null;
         book.set_needs_saving (false);
         save_as_menuitem.set_sensitive (false);
+        copy_to_clipboard_menuitem.set_sensitive (false);
     }
 
     [CCode (cname = "G_MODULE_EXPORT new_button_clicked_cb", instance_pos = -1)]
@@ -610,6 +639,21 @@ public class UserInterface
         if (have_iter)
             paper_size_combo.set_active_iter (iter);
     }
+    
+    private void set_brightness (int brightness)
+    {
+        brightness_adjustment.set_value (brightness);
+    }
+
+    private void set_contrast (int contrast)
+    {
+        contrast_adjustment.set_value (contrast);
+    }
+
+    private void set_quality (int quality)
+    {
+        quality_adjustment.set_value (quality);
+    }
 
     private int get_text_dpi ()
     {
@@ -658,6 +702,21 @@ public class UserInterface
         return false;
     }
 
+    private int get_brightness ()
+    {
+        return (int) brightness_adjustment.get_value ();
+    }
+
+    private int get_contrast ()
+    {
+        return (int) contrast_adjustment.get_value ();
+    }
+
+    private int get_quality ()
+    {
+        return (int) quality_adjustment.get_value ();
+    }
+
     private ScanOptions get_scan_options ()
     {
         var options = new ScanOptions ();
@@ -674,6 +733,8 @@ public class UserInterface
             options.depth = 8;
         }
         get_paper_size (out options.paper_width, out options.paper_height);
+        options.brightness = get_brightness ();
+        options.contrast = get_contrast ();
 
         return options;
     }
@@ -791,7 +852,7 @@ public class UserInterface
 
         try
         {
-            page.save ("tiff", file);
+            page.save ("tiff", get_quality (), file);
         }
         catch (Error e)
         {
@@ -981,6 +1042,14 @@ public class UserInterface
         save_document (false);
     }
 
+    [CCode (cname = "G_MODULE_EXPORT copy_to_clipboard_button_clicked_cb", instance_pos = -1)]
+    public void copy_to_clipboard_button_clicked_cb (Gtk.Widget widget)
+    {
+        var page = book_view.get_selected ();
+        if (page != null)
+            page.copy_to_clipboard (window);
+    }
+
     [CCode (cname = "G_MODULE_EXPORT save_as_file_button_clicked_cb", instance_pos = -1)]
     public void save_as_file_button_clicked_cb (Gtk.Widget widget)
     {
@@ -1015,7 +1084,7 @@ public class UserInterface
     [CCode (cname = "G_MODULE_EXPORT email_button_clicked_cb", instance_pos = -1)]
     public void email_button_clicked_cb (Gtk.Widget widget)
     {
-        email (document_hint);
+        email (document_hint, get_quality ());
     }
 
     [CCode (cname = "G_MODULE_EXPORT print_button_clicked_cb", instance_pos = -1)]
@@ -1069,7 +1138,7 @@ public class UserInterface
         Gtk.show_about_dialog (window,
                                "title", title,
                                "program-name", "Simple Scan",
-                               "version", Config.VERSION,
+                               "version", VERSION,
                                "comments", description,
                                "logo-icon-name", "scanner",
                                "authors", authors,
@@ -1101,6 +1170,9 @@ public class UserInterface
         settings.set_enum ("page-side", get_page_side ());
         settings.set_int ("paper-width", paper_width);
         settings.set_int ("paper-height", paper_height);
+        settings.set_int ("brightness", get_brightness ());
+        settings.set_int ("contrast", get_contrast ());
+        settings.set_int ("jpeg-quality", get_quality ());
         settings.set_int ("window-width", window_width);
         settings.set_int ("window-height", window_height);
         settings.set_boolean ("window-is-maximized", window_is_maximized);
@@ -1111,6 +1183,9 @@ public class UserInterface
 
         window.destroy ();
 
+        if (autosave_manager != null)
+            autosave_manager.cleanup ();
+
         return true;
     }
 
@@ -1237,23 +1312,23 @@ public class UserInterface
         save_toolbutton.set_sensitive (book.get_needs_saving ());
         if (book.get_needs_saving ())
             save_as_menuitem.set_sensitive (true);
+        copy_to_clipboard_menuitem.set_sensitive (true);
     }
 
     private void load ()
     {
-        Gtk.IconTheme.get_default ().append_search_path (Config.ICON_DIR);
+        Gtk.IconTheme.get_default ().append_search_path (ICON_DIR);
 
         Gtk.Window.set_default_icon_name ("scanner");
 
         builder = new Gtk.Builder ();
-        var filename = Path.build_filename (Config.UI_DIR, "simple-scan.ui", null);
         try
         {
-            builder.add_from_file (filename);
+            builder.add_from_resource ("/org/gnome/SimpleScan/simple-scan.ui");
         }
         catch (Error e)
         {
-            critical ("Unable to load UI %s: %s\n", filename, e.message);
+            critical ("Unable to load UI: %s\n", e.message);
             show_error_dialog (/* Title of dialog when cannot load required files */
                                _("Files missing"),
                                /* Description in dialog when cannot load required files */
@@ -1272,6 +1347,7 @@ public class UserInterface
         crop_rotate_menuitem = (Gtk.MenuItem) builder.get_object ("crop_rotate_menuitem");
         save_menuitem = (Gtk.MenuItem) builder.get_object ("save_menuitem");
         save_as_menuitem = (Gtk.MenuItem) builder.get_object ("save_as_menuitem");
+        copy_to_clipboard_menuitem = (Gtk.MenuItem) builder.get_object ("copy_to_clipboard_menuitem");
         save_toolbutton = (Gtk.ToolButton) builder.get_object ("save_toolbutton");
         stop_menuitem = (Gtk.MenuItem) builder.get_object ("stop_scan_menuitem");
         stop_toolbutton = (Gtk.ToolButton) builder.get_object ("stop_toolbutton");
@@ -1297,6 +1373,12 @@ public class UserInterface
         page_side_model = (Gtk.ListStore) page_side_combo.get_model ();
         paper_size_combo = (Gtk.ComboBox) builder.get_object ("paper_size_combo");
         paper_size_model = (Gtk.ListStore) paper_size_combo.get_model ();
+        brightness_scale = (Gtk.Scale) builder.get_object ("brightness_scale");
+        brightness_adjustment = (Gtk.Adjustment) brightness_scale.get_adjustment ();
+        contrast_scale = (Gtk.Scale) builder.get_object ("contrast_scale");
+        contrast_adjustment = (Gtk.Adjustment) contrast_scale.get_adjustment ();
+        quality_scale = (Gtk.Scale) builder.get_object ("quality_scale");
+        quality_adjustment = (Gtk.Adjustment) quality_scale.get_adjustment ();
 
         /* Add InfoBar (not supported in Glade) */
         info_bar = new Gtk.InfoBar ();
@@ -1363,6 +1445,33 @@ public class UserInterface
         var paper_height = settings.get_int ("paper-height");
         set_paper_size (paper_width, paper_height);
 
+        var lower = brightness_adjustment.get_lower ();
+        var darker_label = "<small>%s</small>".printf (_("Darker"));
+        var upper = brightness_adjustment.get_upper ();
+        var lighter_label = "<small>%s</small>".printf (_("Lighter"));
+        brightness_scale.add_mark (lower, Gtk.PositionType.BOTTOM, darker_label);
+        brightness_scale.add_mark (0, Gtk.PositionType.BOTTOM, null);
+        brightness_scale.add_mark (upper, Gtk.PositionType.BOTTOM, lighter_label);
+        set_brightness (settings.get_int ("brightness"));
+
+        lower = contrast_adjustment.get_lower ();
+        var less_label = "<small>%s</small>".printf (_("Less"));
+        upper = contrast_adjustment.get_upper ();
+        var more_label = "<small>%s</small>".printf (_("More"));
+        contrast_scale.add_mark (lower, Gtk.PositionType.BOTTOM, less_label);
+        contrast_scale.add_mark (0, Gtk.PositionType.BOTTOM, null);
+        contrast_scale.add_mark (upper, Gtk.PositionType.BOTTOM, more_label);
+        set_contrast (settings.get_int ("contrast"));
+
+        lower = quality_adjustment.get_lower ();
+        var minimum_label = "<small>%s</small>".printf (_("Minimum"));
+        upper = quality_adjustment.get_upper ();
+        var maximum_label = "<small>%s</small>".printf (_("Maximum"));
+        quality_scale.add_mark (lower, Gtk.PositionType.BOTTOM, minimum_label);
+        quality_scale.add_mark (75, Gtk.PositionType.BOTTOM, null);
+        quality_scale.add_mark (upper, Gtk.PositionType.BOTTOM, maximum_label);
+        set_quality (settings.get_int ("jpeg-quality"));
+
         var device = settings.get_string ("selected-device");
         if (device != null)
         {